summaryrefslogtreecommitdiffstats
path: root/dcae-cli/dcae_cli/util/run.py
diff options
context:
space:
mode:
authorMichael Hwang <mhwang@research.att.com>2017-09-28 17:05:52 -0400
committerMichael Hwang <mhwang@research.att.com>2017-09-28 17:07:00 -0400
commit809230f9e3dea1adebbff4aa6927422bffc83ecc (patch)
tree03fcf7998a9ea638505b3a7c1dd3ca1bd5aa17db /dcae-cli/dcae_cli/util/run.py
parentaf7747ca4a7d849dbef9f86b31216e388334f876 (diff)
Fetch docker logins from Consul
Change-Id: I521fd549b12042fa1d12481fbb0beb535f52e06f Issue-Id: DCAEGEN2-91 Signed-off-by: Michael Hwang <mhwang@research.att.com>
Diffstat (limited to 'dcae-cli/dcae_cli/util/run.py')
-rw-r--r--dcae-cli/dcae_cli/util/run.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/dcae-cli/dcae_cli/util/run.py b/dcae-cli/dcae_cli/util/run.py
index 67535fa..e483d04 100644
--- a/dcae-cli/dcae_cli/util/run.py
+++ b/dcae-cli/dcae_cli/util/run.py
@@ -167,17 +167,21 @@ def run_component(user, cname, cver, catalog, additional_user, attached, force,
image = catalog.get_docker_image(cname, cver)
docker_config = catalog.get_docker_config(cname, cver)
+ docker_logins = dis.get_docker_logins()
+
if should_wait:
du.deploy_component(profile, image, instance_name, docker_config,
- should_wait=True)
+ should_wait=True, logins=docker_logins)
else:
- result = du.deploy_component(profile, image, instance_name, docker_config)
+ result = du.deploy_component(profile, image, instance_name, docker_config,
+ logins=docker_logins)
log.debug(result)
if result:
log.info("Deployed {0}. Verifying..".format(instance_name))
- max_wait = 15 # 15s
+ # TODO: Be smarter here but for now wait longer i.e. 5min
+ max_wait = 300 # 300s == 5min
if _verify_component(instance_name, max_wait, dis.consul_host):
log.info("Container is up and healthy")