From 5d8f67f74aa2e6d54263b0455ad16c35347a1bb5 Mon Sep 17 00:00:00 2001
From: Wes Hayutin <weshayutin@gmail.com>
Date: Thu, 16 Aug 2018 12:46:33 -0400
Subject: [PATCH] add delorean-current to repolist for updates

The list of containers that are updated are generated
from a list of rpms from the gating repo.  These
containers are updated w/ the gating repo and dlrn-current.

That makes the above set of containers out of sync w/
the rest of the containers.  The list of containers
that are updated needs to include changes required
by dlrn-current AND the gating repo.

The --enablerepo parameter for repoquery seems to support
comma-delimited lists, we'll take advantage of that so that we don't
need edit ansible-role-tripleo-modify-image parameter interface.

Co-Authored-By: Jiri Stransky <jistr@redhat.com>
Closes-Bug: #1786764
Change-Id: Ie12021ace7e9eb1695aa97ac5d97f3b948be9d86
---
 roles/overcloud-prep-containers/defaults/main.yml               | 1 +
 .../templates/overcloud-prep-containers.sh.j2                   | 2 +-
 roles/undercloud-deploy/defaults/main.yml                       | 2 ++
 .../templates/containers-prepare-parameter.yaml.j2              | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/roles/overcloud-prep-containers/defaults/main.yml b/roles/overcloud-prep-containers/defaults/main.yml
index 1effb7a26..5533445af 100644
--- a/roles/overcloud-prep-containers/defaults/main.yml
+++ b/roles/overcloud-prep-containers/defaults/main.yml
@@ -10,3 +10,4 @@ container_process_count: 8
 use_overcloud_mixed_upgrade: false
 prep_container_upgrade_run: false
 gating_repo_name: gating-repo
+update_containers_repo: "{{ gating_repo_name }},delorean-current"
diff --git a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2 b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
index 295719f73..8c11078d4 100644
--- a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
+++ b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
@@ -115,7 +115,7 @@ openstack overcloud container image upload --debug --config-file {{ working_dir
 ## * update the containers with yum updates from OpenStack repos.  ( delorean-current, dependent patches built by DLRN )
 ## ::
 
-packages_for_update="$(repoquery --disablerepo='*' --enablerepo={{ gating_repo_name }} --qf %{NAME} -a 2>{{ working_dir }}/repoquery.err.log | sort -u | xargs)"
+packages_for_update="$(repoquery --disablerepo='*' --enablerepo={{ update_containers_repo }} --qf %{NAME} -a 2>{{ working_dir }}/repoquery.err.log | sort -u | xargs)"
 
 if [[ -n "$packages_for_update" ]]; then
     openstack overcloud container image prepare \
diff --git a/roles/undercloud-deploy/defaults/main.yml b/roles/undercloud-deploy/defaults/main.yml
index 6c9e34c86..254378465 100644
--- a/roles/undercloud-deploy/defaults/main.yml
+++ b/roles/undercloud-deploy/defaults/main.yml
@@ -77,6 +77,8 @@ undercloud_network_environment_args: {}
 ctlplane_masquerade: false
 
 update_containers: false
+gating_repo_name: gating-repo
+update_containers_repo: "{{ gating_repo_name }},delorean-current"
 undercloud_enable_routed_networks: false
 
 default_undercloud_roles_data_path: "{{ undercloud_templates_path }}/roles_data_undercloud.yaml"
diff --git a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
index e173ee590..c2f5737e6 100644
--- a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
+++ b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
@@ -12,7 +12,7 @@ parameter_defaults:
       tasks_from: yum_update.yml
       compare_host_packages: true
       yum_repos_dir_path: /etc/yum.repos.d
-      update_repo: "{{ gating_repo_name|default('gating-repo') }}"
+      update_repo: "{{ update_containers_repo }}"
 {% endif %}
     set:
       tag: "{{ container_build_id }}"