Code Review
/
apex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
4616c9c
)
Merge "Fixes baremetal noha deployments"
author
Feng Pan
<fpan@redhat.com>
Tue, 29 Aug 2017 00:54:38 +0000
(
00:54
+0000)
committer
Gerrit Code Review
<gerrit@opnfv.org>
Tue, 29 Aug 2017 00:54:38 +0000
(
00:54
+0000)
apex/overcloud/overcloud_deploy.py
patch
|
blob
|
history
diff --git
a/apex/overcloud/overcloud_deploy.py
b/apex/overcloud/overcloud_deploy.py
index
3c10846
..
5ee2a33
100644
(file)
--- a/
apex/overcloud/overcloud_deploy.py
+++ b/
apex/overcloud/overcloud_deploy.py
@@
-137,6
+137,8
@@
def create_deploy_cmd(ds, ns, inv, tmp_dir,
logging.error("Detected 0 control or compute nodes. Control nodes: "
"{}, compute nodes{}".format(num_control, num_compute))
raise ApexDeployException("Invalid number of control or computes")
+ elif num_control > 1 and not ds['global_params']['ha_enabled']:
+ num_control = 1
cmd = "openstack overcloud deploy --templates --timeout {} " \
"--libvirt-type kvm".format(con.DEPLOY_TIMEOUT)
# build cmd env args