From: Tim Rozet <trozet@redhat.com>
Date: Mon, 28 Aug 2017 13:53:55 +0000 (-0400)
Subject: Fixes baremetal noha deployments
X-Git-Tag: opnfv-5.0.0~79^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f32fb8b9bf746170b343546d6a709c95dc81f300;p=apex.git

Fixes baremetal noha deployments

There is a bug where when we have 3 nodes tagged as control in inventory
we are automatically using all 3, even for a noha deployment.

JIRA: APEX-507

Change-Id: Id2a9be2c52d0c7c81b9c5dcbc93006a476abb537
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

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