From fe98f68f5be9cabd9acbba4510a072dcf5c2e0a2 Mon Sep 17 00:00:00 2001
From: Eric Brown <browne@vmware.com>
Date: Thu, 14 Jul 2016 16:41:27 -0700
Subject: [PATCH] VMware: deprecate wsdl_location conf option

The wsdl_location is no longer needed. It was only required to be
set when connecting to a vCenter of version less than 5.1. The
current minimum version of the VMware vCenter driver is 5.1, so
its time to deprecate and later remove this option.

Change-Id: Ifffb90d5cc8143aac9b472d25d5fcb69b3252b92
---
 nova/conf/vmware.py                                        | 5 +++++
 nova/virt/vmwareapi/driver.py                              | 1 -
 .../deprecate-vmware-wsdl-location-97af576f53fef771.yaml   | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/deprecate-vmware-wsdl-location-97af576f53fef771.yaml

diff --git a/nova/conf/vmware.py b/nova/conf/vmware.py
index 9cac696005b3..917039958509 100644
--- a/nova/conf/vmware.py
+++ b/nova/conf/vmware.py
@@ -190,6 +190,11 @@ is avoided as it creates copy of the virtual machine that shares
 virtual disks with its parent VM.
 """),
     cfg.StrOpt('wsdl_location',
+               deprecated_for_removal=True,
+               deprecated_reason='Only vCenter versions earlier than 5.1 '
+                                 'require this option and the current '
+                                 'minimum version is 5.1.',
+               deprecated_since='15.0.0',
                help="""
 This option specifies VIM Service WSDL Location
 
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py
index d3916ef8b1cb..fe88d7dc69d9 100644
--- a/nova/virt/vmwareapi/driver.py
+++ b/nova/virt/vmwareapi/driver.py
@@ -515,7 +515,6 @@ class VMwareAPISession(api.VMwareAPISession):
                 task_poll_interval=CONF.vmware.task_poll_interval,
                 scheme=scheme,
                 create_session=True,
-                wsdl_loc=CONF.vmware.wsdl_location,
                 cacert=cacert,
                 insecure=insecure)
 
diff --git a/releasenotes/notes/deprecate-vmware-wsdl-location-97af576f53fef771.yaml b/releasenotes/notes/deprecate-vmware-wsdl-location-97af576f53fef771.yaml
new file mode 100644
index 000000000000..0ee286439c2f
--- /dev/null
+++ b/releasenotes/notes/deprecate-vmware-wsdl-location-97af576f53fef771.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+  - Deprecate the VMware driver's ``wsdl_location`` config option. This
+    option pointed to the location of the WSDL files required when using
+    vCenter versions earlier than 5.1. Since the minimum supported version
+    of vCenter is 5.1, there is no longer a need for this option and its
+    value is ignored.