Make get_ips timeout poll configurable

This commit increases the default timeout used by lxc-start-ephemeral
from 5 to 10, and adds support for an LXC_IP_TIMEOUT override.

Patchset 2:
  - Previous patch used a command line arg.

Signed-off-by: John McFarlane <john@rockfloat.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/lxc/lxc-start-ephemeral.in b/src/lxc/lxc-start-ephemeral.in
index cb1f732c69bfc998c19eb2f9b6dc7250cadd679e..4cbf93fedf85ce988f61d3d06d3822c8187ff164 100644 (file)
--- a/src/lxc/lxc-start-ephemeral.in
+++ b/src/lxc/lxc-start-ephemeral.in
@@ -273,7 +273,7 @@ if not args.command and not args.daemon:
     sys.exit(0)
 
 # Try to get the IP addresses
-ips = dest.get_ips(timeout=5)
+ips = dest.get_ips(timeout=10)
 
 # Deal with the case where we just print info about the container
 if args.daemon:

diff --git a/src/python-lxc/lxc/__init__.py b/src/python-lxc/lxc/__init__.py
index 9ada7ffef94bbb6dbb601af8d431b30141d0e272..4891cd1dbc184bc684ca7dff8ece12362107544e 100644 (file)
--- a/src/python-lxc/lxc/__init__.py
+++ b/src/python-lxc/lxc/__init__.py
@@ -369,6 +369,7 @@ class Container(_lxc.Container):
             kwargs['scope'] = scope
 
         ips = None
+        timeout = int(os.environ.get('LXC_GETIP_TIMEOUT', timeout))
 
         while not ips:
             ips = _lxc.Container.get_ips(self, **kwargs)