Merge "Deprecate wsdl_location option"

manifests/compute/vmware.pp

@@ -37,12 +37,6 @@
 #   (optional) Whether to use linked clone strategy while creating VM's.
 #   Defaults to true.
 #
-# [*wsdl_location*]
-#   (optional) VIM Service WSDL Location e.g
-#   http://<server>/vimService.wsdl. Optional over-ride to
-#   default location for bug work-arounds.
-#   Defaults to $::os_service_default
-#
 # [*compute_driver*]
 #   (optional) Compute driver.
 #   Defaults to 'vmwareapi.VMwareVCDriver'
@@ -63,6 +57,13 @@
 #   (optional) Regex to match the name of a datastore.
 #   Defaults to $::os_service_default
 #
+# DEPRECATED PARAMETERS
+# [*wsdl_location*]
+#   (optional) VIM Service WSDL Location e.g
+#   http://<server>/vimService.wsdl. Optional over-ride to
+#   default location for bug work-arounds.
+#   Defaults to undef
+#
 class nova::compute::vmware(
   $host_ip,
   $host_username,
@@ -72,15 +73,20 @@ class nova::compute::vmware(
   $maximum_objects    = 100,
   $task_poll_interval = 5.0,
   $use_linked_clone   = true,
-  $wsdl_location      = $::os_service_default,
   $compute_driver     = 'vmwareapi.VMwareVCDriver',
   $insecure           = $::os_service_default,
   $ca_file            = $::os_service_default,
   $datastore_regex    = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $wsdl_location      = undef,
 ) {
 
   include ::nova::deps
 
+  if $wsdl_location {
+    warning('wsdl_location is deprecated, has no effect and will be removed in the future release.')
+  }
+
   nova_config {
     'DEFAULT/compute_driver':    value => $compute_driver;
     'vmware/host_ip':            value => $host_ip;
@@ -91,7 +97,6 @@ class nova::compute::vmware(
     'vmware/maximum_objects':    value => $maximum_objects;
     'vmware/task_poll_interval': value => $task_poll_interval;
     'vmware/use_linked_clone':   value => $use_linked_clone;
-    'vmware/wsdl_location':      value => $wsdl_location;
     'vmware/insecure':           value => $insecure;
     'vmware/ca_file':            value => $ca_file;
     'vmware/datastore_regex':    value => $datastore_regex;

releasenotes/notes/deprecate_wsdl_location_option-23981a34fe891d36.yaml

@@ -0,0 +1,3 @@
+---
+deprecations:
+  - Deprecate the VMware driver's ``wsdl_location`` config option.

spec/classes/nova_compute_vmware_spec.rb

@@ -14,7 +14,6 @@ describe 'nova::compute::vmware' do
      :maximum_objects => 100,
      :task_poll_interval => 10.5,
      :use_linked_clone => false,
-     :wsdl_location => 'http://127.0.0.1:8080/vmware/SDK/wsdl/vim25/vimService.wsdl',
      :compute_driver => 'vmwareapi.FoobarDriver',
      :insecure => true,
      :datastore_regex => '/(?:[^:]|:[^:])+/' }
@@ -33,7 +32,6 @@ describe 'nova::compute::vmware' do
         is_expected.to contain_nova_config('vmware/maximum_objects').with_value(100)
         is_expected.to contain_nova_config('vmware/task_poll_interval').with_value(5.0)
         is_expected.to contain_nova_config('vmware/use_linked_clone').with_value(true)
-        is_expected.to contain_nova_config('vmware/wsdl_location').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_nova_config('vmware/insecure').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_nova_config('vmware/ca_file').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_nova_config('vmware/datastore_regex').with_value('<SERVICE DEFAULT>')
@@ -58,7 +56,6 @@ describe 'nova::compute::vmware' do
       is_expected.to contain_nova_config('vmware/maximum_objects').with_value(params[:maximum_objects])
       is_expected.to contain_nova_config('vmware/task_poll_interval').with_value(params[:task_poll_interval])
       is_expected.to contain_nova_config('vmware/use_linked_clone').with_value(false)
-      is_expected.to contain_nova_config('vmware/wsdl_location').with_value(params[:wsdl_location])
       is_expected.to contain_nova_config('vmware/insecure').with_value(params[:insecure])
       is_expected.to contain_nova_config('vmware/datastore_regex').with_value(params[:datastore_regex])
     end