revert-skip-external-update (#266)

cloudify-cosmo · Dec 7, 2023 · 2b67e2f · 2b67e2f
1 parent e9f9757
commit 2b67e2f
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 13 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,5 @@
+2.20.14:
+  - Revert skip external resources update.
 2.20.13:
   - Remove RSA lib pin.
 2.20.12:

diff --git a/cloudify_vsphere/__version__.py b/cloudify_vsphere/__version__.py
@@ -1 +1 @@
-version = '2.20.13'
+version = '2.20.14'
diff --git a/plugin.yaml b/plugin.yaml
@@ -6,7 +6,7 @@ plugins:
   vsphere:
     executor: central_deployment_agent
     package_name: cloudify-vsphere-plugin
-    package_version: '2.20.13'
+    package_version: '2.20.14'
 
 data_types:
 

diff --git a/plugin_1_4.yaml b/plugin_1_4.yaml
@@ -6,7 +6,7 @@ plugins:
   vsphere:
     executor: central_deployment_agent
     package_name: cloudify-vsphere-plugin
-    package_version: '2.20.13'
+    package_version: '2.20.14'
 
 data_types:
 

diff --git a/plugin_1_5.yaml b/plugin_1_5.yaml
@@ -6,7 +6,7 @@ plugins:
   vsphere:
     executor: central_deployment_agent
     package_name: cloudify-vsphere-plugin
-    package_version: '2.20.13'
+    package_version: '2.20.14'
     properties_description: |
       Manage vSphere resources.
     properties:

diff --git a/v2_plugin.yaml b/v2_plugin.yaml
@@ -10,7 +10,7 @@ plugins:
   vsphere:
     executor: central_deployment_agent
     package_name: cloudify-vsphere-plugin
-    package_version: '2.20.13'
+    package_version: '2.20.14'
 
 data_types:
 

diff --git a/vsphere_server_plugin/server.py b/vsphere_server_plugin/server.py
@@ -1102,10 +1102,6 @@ def check_drift(server_client, **_):
             resource_name=server_obj.name))
     ctx.instance.refresh()
 
-    # if external we want to mark it as no drift , so we won't trigger upate
-    if ctx.node.properties.get('use_external_resource', False):
-        return False
-
     expected_configuration = ctx.instance.runtime_properties.get(
         'expected_configuration')
     current_configuration = {}

diff --git a/vsphere_storage_plugin/storage.py b/vsphere_storage_plugin/storage.py
@@ -224,10 +224,6 @@ def check_drift(storage_client, **_):
         'Checking drift state for {resource_name}.'.format(
             resource_name=resource_name))
 
-    # if external we want to mark it as no drift , so we won't trigger upate
-    if ctx.node.properties.get('use_external_resource', False):
-        return False
-
     # get new storage_size from update
     storage_size = ctx.node.properties['storage'].get('storage_size')
     current_size = ctx.instance.runtime_properties.get(VSPHERE_STORAGE_SIZE)