igw: add support for IPv6

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/library/igw_purge.py b/library/igw_purge.py
index b3f2e6ebb9dda7ea49c5713c59f0f011aa7eb1b5..ce125b49745c4dd655555ff1ed51cc6ab6dab59d 100644 (file)
--- a/library/igw_purge.py
+++ b/library/igw_purge.py
@@ -44,7 +44,7 @@ from ansible.module_utils.basic import *  # noqa E402
 import ceph_iscsi_config.settings as settings  # noqa E402
 from ceph_iscsi_config.common import Config  # noqa E402
 from ceph_iscsi_config.lio import LIO, Gateway  # noqa E402
-from ceph_iscsi_config.utils import ipv4_addresses, get_ip  # noqa E402
+from ceph_iscsi_config.utils import ip_addresses, resolve_ip_addresses  # noqa E402
 
 __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 b3f2e6ebb9dda7ea49c5713c59f0f011aa7eb1b5..ce125b49745c4dd655555ff1ed51cc6ab6dab59d 100644 (file)
--- 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 *  # noqa E402
 import ceph_iscsi_config.settings as settings  # noqa E402
 from ceph_iscsi_config.common import Config  # noqa E402
 from ceph_iscsi_config.lio import LIO, Gateway  # noqa E402
-from ceph_iscsi_config.utils import ipv4_addresses, get_ip  # noqa E402
+from ceph_iscsi_config.utils import ip_addresses, resolve_ip_addresses  # noqa E402
 
 __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