From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 2 Nov 2018 14:30:34 +0000 (-0400)
Subject: igw: add support for IPv6
X-Git-Tag: v3.2.0rc2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b40e2bc87fb6855d5eaebde50d5f8384afdfa8c;p=ceph-ansible.git

igw: add support for IPv6

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0aff0e9ede433d75d040a70d1a21b0acd8f4790f)

Conflicts:
	library/igw_purge.py: trivial resolution
	roles/ceph-iscsi-gw/library/igw_purge.py: trivial resolution
---

diff --git a/library/igw_purge.py b/library/igw_purge.py
index 4e29ddc47..798624274 100644
--- a/library/igw_purge.py
+++ b/library/igw_purge.py
@@ -44,7 +44,7 @@ from ansible.module_utils.basic import *
 import ceph_iscsi_config.settings as settings
 from ceph_iscsi_config.common import Config
 from ceph_iscsi_config.lio import LIO, Gateway
-from ceph_iscsi_config.utils import ipv4_addresses, get_ip
+from ceph_iscsi_config.utils import ip_addresses, resolve_ip_addresses
 
 __author__ = 'pcuzner@redhat.com'
 
@@ -93,10 +93,12 @@ def is_cleanup_host(config):
 
         gw_1 = config.config["gateways"]["ip_list"][0]
 
-        usable_ip = get_ip(gw_1)
-        if usable_ip != '0.0.0.0':
-            if usable_ip in ipv4_addresses():
+        local_ips = ip_addresses()
+        usable_ips = resolve_ip_addresses(gw_1)
+        for ip in usable_ips:
+            if ip in local_ips:
                 cleanup = True
+                break
 
     return cleanup
 
diff --git a/roles/ceph-iscsi-gw/library/igw_purge.py b/roles/ceph-iscsi-gw/library/igw_purge.py
index 4e29ddc47..798624274 100644
--- a/roles/ceph-iscsi-gw/library/igw_purge.py
+++ b/roles/ceph-iscsi-gw/library/igw_purge.py
@@ -44,7 +44,7 @@ from ansible.module_utils.basic import *
 import ceph_iscsi_config.settings as settings
 from ceph_iscsi_config.common import Config
 from ceph_iscsi_config.lio import LIO, Gateway
-from ceph_iscsi_config.utils import ipv4_addresses, get_ip
+from ceph_iscsi_config.utils import ip_addresses, resolve_ip_addresses
 
 __author__ = 'pcuzner@redhat.com'
 
@@ -93,10 +93,12 @@ def is_cleanup_host(config):
 
         gw_1 = config.config["gateways"]["ip_list"][0]
 
-        usable_ip = get_ip(gw_1)
-        if usable_ip != '0.0.0.0':
-            if usable_ip in ipv4_addresses():
+        local_ips = ip_addresses()
+        usable_ips = resolve_ip_addresses(gw_1)
+        for ip in usable_ips:
+            if ip in local_ips:
                 cleanup = True
+                break
 
     return cleanup