summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-07-14 06:00:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-14 06:00:59 +0000
commit31e4b613b022ed321472399d52241de3d7421a2f (patch)
tree71e2bfc46289b53cda025670d0cb95cfbe190a6a
parent0bc830f972dc5ae7275285b94d8738d1286f9a0e (diff)
parent9d91215c859c5ebad4ba94e9c321f28ddb7b0316 (diff)
Merge "Modify deploy/client.py"
-rw-r--r--deploy/client.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/deploy/client.py b/deploy/client.py
index 6d5daa38..366ae418 100644
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -952,6 +952,9 @@ class CompassClient(object):
deployment_timeout = time.time() + 60 * float(CONF.deployment_timeout) # noqa
current_time = time.time
while current_time() < deployment_timeout:
+ if not ansible_print.is_alive():
+ raise RuntimeError("can not get ansible log")
+
status, cluster_state = self.get_cluster_state(cluster_id)
if not self.is_ok(status):
raise RuntimeError("can not get cluster state")
@@ -975,7 +978,7 @@ class CompassClient(object):
% (current_time(), deployment_timeout))
LOG.info("cobbler status:")
os.system("sudo docker exec compass-cobbler bash -c \
- 'cobbler status'" % (CONF.rsa_file))
+ 'cobbler status'")
raise RuntimeError("installation timeout")
try: