Merge pull request #110 from shuhaowu/flexible-ip-wait-timeout

Allow wait timeout to be changed for IP

lxdock/conf/schema.py

@@ -34,6 +34,9 @@ def get_schema():
             'password': str,
             'shell': str,
         }],
+        'extras': {
+            'network_wait_timeout': int
+        }
     }
 
     def _check_provisioner_config(config):

lxdock/container.py

@@ -348,8 +348,9 @@ def _setup_ip(self):
         """ Setup the IP address of the considered container. """
         ip = get_ip(self._container)
         if not ip:
-            logger.info('No IP yet, waiting for at most 10 seconds...')
-            ip = self._wait_for_ip()
+            network_wait_timeout = self.options.get("extras", {}).get("network_wait_timeout", 10)
+            logger.info('No IP yet, waiting for at most {} seconds...'.format(network_wait_timeout))
+            ip = self._wait_for_ip(network_wait_timeout)
         if not ip:
             logger.warn('STILL no IP! Container is up, but probably broken.')
             logger.info('Maybe that restarting it will help? Not trying to provision.')