Merge pull request #136 from cloudify-cosmo/solaris

Deprecate cloudify < 4.1 (EOL: April 30th, 2019)
cloudify-cosmo · May 14, 2019 · e01e952 · e01e952
2 parents 0de0b7b + b50686a
commit e01e952
Show file tree

Hide file tree

Showing 11 changed files with 180 additions and 1,398 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,6 +2,8 @@
   - Support Solaris guests (OmniOS CE)
   - Wait IP flag for wait any ip's on connected NIC
   - Set extra properties set to VM
+  - Deprecate support for cloudify-plugins-common < 4.1.
+    https://cloudify.co/product/cloudify-lifecycle/
 2.14.0:
   - Export host and datastore for external VM
 2.13.1:

diff --git a/cloudify_vsphere/devices/__init__.py b/cloudify_vsphere/devices/__init__.py
@@ -20,6 +20,7 @@
 from vsphere_plugin_common.constants import (
     VSPHERE_SERVER_ID,
     NETWORK_NAME,
+    IP,
     SWITCH_DISTRIBUTED)
 from vsphere_plugin_common import ContollerClient, ServerClient
 
@@ -129,7 +130,7 @@ def attach_server_to_ethernet_card(ctx, **kwargs):
         ctx.source.node.properties.get("connection_config"),
         ctx.source.instance.runtime_properties.get(VSPHERE_SERVER_ID),
         ctx.target.instance.runtime_properties.get('name'))
-    ctx.source.instance.runtime_properties['ip'] = ip
+    ctx.source.instance.runtime_properties[IP] = ip
 
 
 @operation

diff --git a/cloudify_vsphere/vendored/__init__.py b/cloudify_vsphere/vendored/__init__.py