summaryrefslogtreecommitdiffstats
path: root/apex/overcloud/deploy.py
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2018-01-31 10:43:16 -0500
committerDan Radez <dradez@redhat.com>2018-01-31 20:36:42 +0000
commite1eda223437eed7bef2bdfa7bef990a6749f1670 (patch)
tree3f5a95b40d9bde3d3443879eb361819ec1e60a2e /apex/overcloud/deploy.py
parent7e365bcfc02900ca1a7da341f47aabcf3123c99f (diff)
wrapping up deploy items for aarch
Change-Id: Ib5f4715d851dc91be6a57fcb5d18a0557a7b0c7f Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'apex/overcloud/deploy.py')
-rw-r--r--apex/overcloud/deploy.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 5c957965..d1099c41 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -11,6 +11,7 @@ import base64
import fileinput
import logging
import os
+import platform
import shutil
import uuid
import struct
@@ -151,6 +152,14 @@ def create_deploy_cmd(ds, ns, inv, tmp_dir,
raise ApexDeployException("Invalid number of control or computes")
elif num_control > 1 and not ds['global_params']['ha_enabled']:
num_control = 1
+ if platform.machine() == 'aarch64':
+ # aarch64 deploys were not completing in the default 90 mins.
+ # Not sure if this is related to the hardware the OOO support
+ # was developed on or the virtualization support in CentOS
+ # Either way it will probably get better over time as the aarch
+ # support matures in CentOS and deploy time should be tested in
+ # the future so this multiplier can be removed.
+ con.DEPLOY_TIMEOUT *= 2
cmd = "openstack overcloud deploy --templates --timeout {} " \
.format(con.DEPLOY_TIMEOUT)
# build cmd env args