Ensured lxdock can work with IPv6 only containers

lxdock · May 31, 2017 · 8e51302 · 8e51302 · ellmetha · May 31, 2017
1 parent 67c125b
commit 8e51302
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/lxdock/container.py b/lxdock/container.py
@@ -13,7 +13,7 @@
 from .exceptions import ContainerOperationFailed
 from .guests import Guest
 from .hosts import Host
-from .network import EtcHosts, get_ipv4_ip
+from .network import EtcHosts, get_ip
 from .provisioners import Provisioner
 from .utils.identifier import folderid
 
@@ -365,7 +365,7 @@ def _setup_hostnames(self, ip):
 
     def _setup_ip(self):
         """ Setup the IP address of the considered container. """
-        ip = get_ipv4_ip(self._container)
+        ip = get_ip(self._container)
         if not ip:
             logger.info('No IP yet, waiting for at most 10 seconds...')
             ip = self._wait_for_ipv4_ip()
@@ -443,7 +443,7 @@ def _wait_for_ipv4_ip(self, seconds=10):
         """ Waits some time before trying to get the IP of the container and returning it. """
         for i in range(seconds):
             time.sleep(1)
-            ip = get_ipv4_ip(self._container)
+            ip = get_ip(self._container)
             if ip:
                 return ip
         return ''

diff --git a/lxdock/network.py b/lxdock/network.py
@@ -4,16 +4,19 @@
 import tempfile
 
 
-def get_ipv4_ip(container):
+def get_ip(container):
     """ Returns the IP adress of a specific container. """
     state = container.state()
     if state.network is None:  # container is not running
         return ''
     eth0 = state.network['eth0']
+    ipv4, ipv6 = '', ''
     for addr in eth0['addresses']:
         if addr['family'] == 'inet':
-            return addr['address']
-    return ''
+            ipv4 = addr['address']
+        elif addr['family'] == 'inet6' and 'global' in addr['scope']:
+            ipv6 = addr['address']
+    return ipv4 or ipv6
 
 
 RE_ETCHOST_LINE = re.compile(r'^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+([\w\-_.]+)$')

diff --git a/lxdock/provisioners/ansible.py b/lxdock/provisioners/ansible.py
@@ -3,7 +3,7 @@
 
 from voluptuous import IsFile, Required
 
-from ..network import get_ipv4_ip
+from ..network import get_ip
 
 from .base import Provisioner
 
@@ -33,7 +33,7 @@ class AnsibleProvisioner(Provisioner):
 
     def provision(self):
         """ Performs the provisioning operations using ansible-playbook. """
-        ip = get_ipv4_ip(self.guest.lxd_container)
+        ip = get_ip(self.guest.lxd_container)
         with tempfile.NamedTemporaryFile() as tmpinv:
             tmpinv.write('{} ansible_user=root'.format(ip).encode('ascii'))
             tmpinv.flush()