From 9a216915e991c329771c8991b542ebee29def1df Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 4 May 2015 11:06:02 -0400 Subject: [PATCH] doc fixes --- cloud/openstack/os_server_volume.py | 4 ++-- cloud/openstack/os_subnet.py | 4 +++- cloud/openstack/os_volume.py | 5 ++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cloud/openstack/os_server_volume.py b/cloud/openstack/os_server_volume.py index 3355ee404d8..a041a070c6e 100644 --- a/cloud/openstack/os_server_volume.py +++ b/cloud/openstack/os_server_volume.py @@ -30,7 +30,7 @@ DOCUMENTATION = ''' module: os_server_volume short_description: Attach/Detach Volumes from OpenStack VM's extends_documentation_fragment: openstack -version_added: "1.10" +version_added: "2.0" description: - Attach or Detach volumes from OpenStack VM's options: @@ -39,11 +39,11 @@ options: - Should the resource be present or absent. choices: [present, absent] default: present + required: false server: description: - Name or ID of server you want to attach a volume to required: true - default: None volume: description: - Name or id of volume you want to attach to a server diff --git a/cloud/openstack/os_subnet.py b/cloud/openstack/os_subnet.py index e6f02816e1d..d9a5c99119c 100644 --- a/cloud/openstack/os_subnet.py +++ b/cloud/openstack/os_subnet.py @@ -28,7 +28,7 @@ DOCUMENTATION = ''' module: os_subnet short_description: Add/Remove subnet to an OpenStack network extends_documentation_fragment: openstack -version_added: "1.10" +version_added: "2.0" description: - Add or Remove a subnet to an OpenStack network options: @@ -36,6 +36,7 @@ options: description: - Indicate desired state of the resource choices: ['present', 'absent'] + required: false default: present network_name: description: @@ -52,6 +53,7 @@ options: - The CIDR representation of the subnet that should be assigned to the subnet. required: true when state is 'present' + default: None ip_version: description: - The IP version of the subnet 4 or 6 diff --git a/cloud/openstack/os_volume.py b/cloud/openstack/os_volume.py index 8cc47363d26..bd3bf637d75 100644 --- a/cloud/openstack/os_volume.py +++ b/cloud/openstack/os_volume.py @@ -28,7 +28,7 @@ DOCUMENTATION = ''' module: os_volume short_description: Create/Delete Cinder Volumes extends_documentation_fragment: openstack -version_added: "1.10" +version_added: "2.0" description: - Create or Remove cinder block storage volumes options: @@ -41,7 +41,6 @@ options: description: - Name of volume required: true - default: None display_description: description: - String describing the volume @@ -53,7 +52,7 @@ options: required: false default: None image: - descritpion: + description: - Image name or id for boot from volume required: false default: None