summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-08-30 13:24:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-30 13:24:29 +0000
commitdd669539ffa924a06f04237a2177422403d82c7b (patch)
tree6d8bb38dfa47d326e3585f584066de8b1aee0e3f
parent15d8c6b0dff0153a5d106d827442e65fe4c9b559 (diff)
parent08fdfbc6470c7f7ba48a62188355ab47ade1ed8c (diff)
Merge "Removes ignoring errors on congress config"
-rw-r--r--apex/overcloud/overcloud_deploy.py2
-rw-r--r--lib/ansible/playbooks/post_deploy_undercloud.yml1
2 files changed, 1 insertions, 2 deletions
diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py
index 5ee2a33d..d54a8f87 100644
--- a/apex/overcloud/overcloud_deploy.py
+++ b/apex/overcloud/overcloud_deploy.py
@@ -552,7 +552,7 @@ def create_congress_cmds(overcloud_file):
else:
cmd = "{} \"{}\" {}".format(driver, driver, ds_cfg)
if driver == 'nova':
- cmd += '--config api_version="2.34"'
+ cmd += ' --config api_version="2.34"'
logging.debug("Congress command created: {}".format(cmd))
cmds.append(cmd)
return cmds
diff --git a/lib/ansible/playbooks/post_deploy_undercloud.yml b/lib/ansible/playbooks/post_deploy_undercloud.yml
index ba0746b2..d6b8805a 100644
--- a/lib/ansible/playbooks/post_deploy_undercloud.yml
+++ b/lib/ansible/playbooks/post_deploy_undercloud.yml
@@ -115,4 +115,3 @@
become_user: stack
when: congress
with_items: "{{ congress_datasources }}"
- ignore_errors: yes