summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-08-29 00:54:38 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-29 00:54:38 +0000
commit0c78953b8184255eba2c55316bc6cbb746796a5f (patch)
treea9bb3cd65762f7f8ed95e6163b51f5e9be219914
parent4616c9c10d574fad8fffa6c827c27a44d406068c (diff)
parentf32fb8b9bf746170b343546d6a709c95dc81f300 (diff)
Merge "Fixes baremetal noha deployments"
-rw-r--r--apex/overcloud/overcloud_deploy.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py
index 3c108464..5ee2a33d 100644
--- 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