From 2b67e2ffbfb1703ff4a6e13960ca43b632ec1ac9 Mon Sep 17 00:00:00 2001
From: Ahmad Musa <53178237+ahmadiesa-abu@users.noreply.github.com>
Date: Thu, 7 Dec 2023 13:05:53 +0200
Subject: [PATCH] revert-skip-external-update (#266)

---
 CHANGELOG.txt                     | 2 ++
 cloudify_vsphere/__version__.py   | 2 +-
 plugin.yaml                       | 2 +-
 plugin_1_4.yaml                   | 2 +-
 plugin_1_5.yaml                   | 2 +-
 v2_plugin.yaml                    | 2 +-
 vsphere_server_plugin/server.py   | 4 ----
 vsphere_storage_plugin/storage.py | 4 ----
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index aa353d74..c48e6343 100644
--- 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
index df7f7f8b..bb7ef062 100644
--- 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
index f020dea7..3f06a627 100644
--- 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
index a5ef7284..08b4b362 100755
--- 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
index 37d339a0..96eb0146 100644
--- 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
index b68cfc33..cccb8ae9 100755
--- 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
index 6728f9f2..41135ec2 100644
--- 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
index d6aec14b..43019d9c 100644
--- 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)