summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apex/deploy.py4
-rw-r--r--apex/overcloud/overcloud_deploy.py2
2 files changed, 6 insertions, 0 deletions
diff --git a/apex/deploy.py b/apex/deploy.py
index 7900170b..6866945b 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -125,22 +125,26 @@ def create_deploy_parser():
deploy_parser.add_argument('--virtual-computes',
dest='virt_compute_nodes',
default=1,
+ type=int,
help='Number of Virtual Compute nodes to create'
' and use during deployment (defaults to 1'
' for noha and 2 for ha)')
deploy_parser.add_argument('--virtual-cpus',
dest='virt_cpus',
default=4,
+ type=int,
help='Number of CPUs to use per Overcloud VM in'
' a virtual deployment (defaults to 4)')
deploy_parser.add_argument('--virtual-default-ram',
dest='virt_default_ram',
default=8,
+ type=int,
help='Amount of default RAM to use per '
'Overcloud VM in GB (defaults to 8).')
deploy_parser.add_argument('--virtual-compute-ram',
dest='virt_compute_ram',
default=None,
+ type=int,
help='Amount of RAM to use per Overcloud '
'Compute VM in GB (defaults to 8). '
'Overrides --virtual-default-ram arg for '
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