From 3d1b6285c3b429f59aad4cfc5b5a5eb629779d4b Mon Sep 17 00:00:00 2001 From: Tom Paine Date: Fri, 22 May 2015 18:21:56 +0100 Subject: [PATCH 1/8] Update vsphere_guest.py Clear up confusing action where disk and hardware state can be passed to a reconfigure but is ignored (module only changes CPU and RAM when state is 'reconfigured' and ignore everything else. --- cloud/vmware/vsphere_guest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index a33fd52ea70..175ed35724b 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -65,7 +65,7 @@ options: default: null state: description: - - Indicate desired state of the vm. + - Indicate desired state of the vm. 'reconfigured' only applies changes to 'memory_mb' and 'num_cpus' in vm_hardware parameter, and only when hot-plugging is enabled for the guest. default: present choices: ['present', 'powered_off', 'absent', 'powered_on', 'restarted', 'reconfigured'] from_template: From 6a04f0d45288a9bad860ec28ca5684fe6edee347 Mon Sep 17 00:00:00 2001 From: Tom Paine Date: Fri, 22 May 2015 18:40:35 +0100 Subject: [PATCH 2/8] Update vsphere_guest.py Clarifies that when using a template, CPU, RAM, NIC and Disk params are silently ignored. --- cloud/vmware/vsphere_guest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index 175ed35724b..20b41942ed6 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -71,7 +71,7 @@ options: from_template: version_added: "1.9" description: - - Specifies if the VM should be deployed from a template (cannot be ran with state) + - Specifies if the VM should be deployed from a template (annot be run with state). Only accepts 'cluster' and 'resource_pool' params. No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied this way. default: no choices: ['yes', 'no'] template_src: From 14d7073b517aff1121b907213016490971d49754 Mon Sep 17 00:00:00 2001 From: Tom Paine Date: Fri, 22 May 2015 18:43:20 +0100 Subject: [PATCH 3/8] Update vsphere_guest.py Remove etc. As reconfigure only reconfigures RAM and CPU. --- cloud/vmware/vsphere_guest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index 20b41942ed6..7faee2303d5 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -195,7 +195,7 @@ EXAMPLES = ''' hostname: esx001.mydomain.local # Deploy a guest from a template -# No reconfiguration of the destination guest is done at this stage, a reconfigure would be needed to adjust memory/cpu etc.. +# No reconfiguration of the destination guest is done at this stage, a reconfigure is needed to adjust RAM/CPU. - vsphere_guest: vcenter_hostname: vcenter.mydomain.local username: myuser From 0ec4c43931c200dc289798a5efea494c8b5dba37 Mon Sep 17 00:00:00 2001 From: Tom Paine Date: Fri, 22 May 2015 19:05:25 +0100 Subject: [PATCH 4/8] Update vsphere_guest.py Spelling mistake. --- cloud/vmware/vsphere_guest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index 7faee2303d5..93fb8961f56 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -71,7 +71,7 @@ options: from_template: version_added: "1.9" description: - - Specifies if the VM should be deployed from a template (annot be run with state). Only accepts 'cluster' and 'resource_pool' params. No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied this way. + - Specifies if the VM should be deployed from a template (cannot be run with state). Only accepts 'cluster' and 'resource_pool' params. No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied this way. default: no choices: ['yes', 'no'] template_src: From 7325d6a8ef43e5dee9bbffab71ebfa4323895ab8 Mon Sep 17 00:00:00 2001 From: Tom Paine Date: Fri, 22 May 2015 19:07:28 +0100 Subject: [PATCH 5/8] Update vsphere_guest.py Remove redundant description. --- cloud/vmware/vsphere_guest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index 93fb8961f56..8e1aa686701 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -71,7 +71,7 @@ options: from_template: version_added: "1.9" description: - - Specifies if the VM should be deployed from a template (cannot be run with state). Only accepts 'cluster' and 'resource_pool' params. No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied this way. + - Specifies if the VM should be deployed from a template (cannot be run with state). No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied when launching from template. default: no choices: ['yes', 'no'] template_src: From c64a3eb03d0f9adb513c7ad4e8e0b222c0052e7e Mon Sep 17 00:00:00 2001 From: Tom Paine Date: Thu, 28 May 2015 19:08:52 +0100 Subject: [PATCH 6/8] Update vsphere_guest.py --- cloud/vmware/vsphere_guest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index 8e1aa686701..8d1b7946688 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -195,7 +195,6 @@ EXAMPLES = ''' hostname: esx001.mydomain.local # Deploy a guest from a template -# No reconfiguration of the destination guest is done at this stage, a reconfigure is needed to adjust RAM/CPU. - vsphere_guest: vcenter_hostname: vcenter.mydomain.local username: myuser From d9db201b9a60dd7680694ae9af113ae21082306b Mon Sep 17 00:00:00 2001 From: Tom Paine Date: Tue, 7 Jul 2015 20:30:07 +0100 Subject: [PATCH 7/8] Update vsphere_guest.py --- cloud/vmware/vsphere_guest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index 8d1b7946688..863755aab26 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -71,7 +71,7 @@ options: from_template: version_added: "1.9" description: - - Specifies if the VM should be deployed from a template (cannot be run with state). No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied when launching from template. + - Specifies if the VM should be deployed from a template (mutually exclusive with state parameter). No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied when launching from template. default: no choices: ['yes', 'no'] template_src: From d6d6186aef83ea807a25124e6fd423d7df42a998 Mon Sep 17 00:00:00 2001 From: Tom Paine Date: Tue, 7 Jul 2015 20:30:33 +0100 Subject: [PATCH 8/8] Update vsphere_guest.py --- cloud/vmware/vsphere_guest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index 863755aab26..5f5925b994d 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -71,7 +71,7 @@ options: from_template: version_added: "1.9" description: - - Specifies if the VM should be deployed from a template (mutually exclusive with state parameter). No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied when launching from template. + - Specifies if the VM should be deployed from a template (mutually exclusive with 'state' parameter). No guest customization changes to hardware such as CPU, RAM, NICs or Disks can be applied when launching from template. default: no choices: ['yes', 'no'] template_src: