summaryrefslogtreecommitdiffstats
path: root/apex/common
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-10-17 11:17:41 -0400
committerTim Rozet <trozet@redhat.com>2018-10-17 23:16:47 -0400
commit0c2284b9aa730bc1143093f13fb35ba0fa879189 (patch)
tree1fb2b7dd983e657db33e5f891630a83dca08adc8 /apex/common
parentcfcabcdc552514702740f5f69c62b5e799b9f24b (diff)
Fixes undercloud accidentally using wrong images/containers
Our undercloud initial install was failing with queens because the --use-heat arg does not work the same way as master/rocky. Therefore the undercloud install would fail, and then try to reinstall on the next ansible task. This one would succeed, via container installation because we were using the wrong undercloud/overcloud disk images. Change-Id: Ifb829aeeec991ba6dbe582fda3e9ee6b9bc733df Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/common')
-rw-r--r--apex/common/constants.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/common/constants.py b/apex/common/constants.py
index b0c21d11..68815be8 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -52,8 +52,8 @@ PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \
DEBUG_OVERCLOUD_PW = 'opnfvapex'
NET_ENV_FILE = 'network-environment.yaml'
DEPLOY_TIMEOUT = 120
-UPSTREAM_RDO = 'https://images.rdoproject.org/master/delorean/current' \
- '-tripleo-rdo/'
+UPSTREAM_RDO = 'https://images.rdoproject.org/{}/delorean/current' \
+ '-tripleo-rdo/'.format(DEFAULT_OS_VERSION)
OPENSTACK_GERRIT = 'https://review.openstack.org'
DOCKER_TAG = 'current-tripleo-rdo'