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>

diff --git a/apex/builders/common_builder.py b/apex/builders/common_builder.py
index b8894ec..d3ddae4 100644 (file)
--- a/apex/builders/common_builder.py
+++ b/apex/builders/common_builder.py
@@ -110,7 +110,8 @@ def is_patch_promoted(change, branch, docker_image=None):
     # Patch applies to overcloud/undercloud
     if docker_image is None:
         oc_url = urllib.parse.urljoin(
-            con.UPSTREAM_RDO.replace('master', branch), 'overcloud-full.tar')
+            con.UPSTREAM_RDO.replace(con.DEFAULT_OS_VERSION,
+                                     branch), 'overcloud-full.tar')
         oc_mtime = utils.get_url_modified_date(oc_url)
         if oc_mtime > submitted_date:
             logging.debug("oc image was last modified at {}, which is"

diff --git a/apex/common/constants.py b/apex/common/constants.py
index b0c21d1..68815be 100644 (file)
--- 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'

diff --git a/lib/ansible/playbooks/configure_undercloud.yml b/lib/ansible/playbooks/configure_undercloud.yml
index 1fb2283..e8e76f0 100644 (file)
--- a/lib/ansible/playbooks/configure_undercloud.yml
+++ b/lib/ansible/playbooks/configure_undercloud.yml
@@ -63,7 +63,7 @@
       when: aarch64
     - block:
         - name: undercloud install
-          shell: openstack undercloud install --use-heat False &> apex-undercloud-install.log
+          shell: openstack undercloud install &> apex-undercloud-install.log
           become: yes
           become_user: stack
       rescue: