updated logic
diff --git a/tasks/local_mgmt_ip.yml b/tasks/local_mgmt_ip.yml
index 446dcb9..b3518af 100644
--- a/tasks/local_mgmt_ip.yml
+++ b/tasks/local_mgmt_ip.yml
@@ -1,18 +1,20 @@
 ---
-- name: Normalized name for management server local ip if on DC-1
-  cache:
-    key: 'local_mgmt_ip'
-    value: "{{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }}"
-  when: groups['dc-1'] is defined and groups['dc-1-ms'] is defined and inventory_hostname in groups['dc-1']
+- block:
+  - name: Normalized name for management server local ip if on DC-1
+    cache:
+      key: 'local_mgmt_ip'
+      value: "{{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }}"
+    when: groups['dc-1'] is defined and groups['dc-1-ms'] is defined and inventory_hostname in groups['dc-1']
 
-- name: Normalized name for management server local ip if on DC-2
-  cache:
-    key: 'local_mgmt_ip'
-    value: "{{ hostvars[groups['dc-2-ms'][0]][interface_name].ipv4.address }}"
-  when: groups['dc-2'] is defined and groups['dc-2-ms'] is defined and inventory_hostname in groups['dc-2']
+  - name: Normalized name for management server local ip if on DC-2
+    cache:
+      key: 'local_mgmt_ip'
+      value: "{{ hostvars[groups['dc-2-ms'][0]][interface_name].ipv4.address }}"
+    when: groups['dc-2'] is defined and groups['dc-2-ms'] is defined and inventory_hostname in groups['dc-2']
 
-- name: Normalized name for management server local ip to DC-1 if current node is not on DC-1 or DC-2
-  cache:
-    key: 'local_mgmt_ip'
-    value: "{{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }}"
-  when: groups['dc-1'] is defined and groups['dc-1-ms'] is defined and not (inventory_hostname in groups['dc-1'] or inventory_hostname in groups['dc-2'])
+  - name: Normalized name for management server local ip to DC-1 if current node is not on DC-1 or DC-2
+    cache:
+      key: 'local_mgmt_ip'
+      value: "{{ hostvars[groups['dc-1-ms'][0]][interface_name].ipv4.address }}"
+    when: inventory_hostname not in groups['dc-1'] or inventory_hostname not in groups['dc-2']
+  when: groups['dc-1'] is defined or groups['dc-1-ms'] is defined