Match RHEL 8 images to containers used

RHEL 8 should use the current-tripleo tagged image
if pulling current-tripleo tagged containers -
as CentOS does.

Change-Id: Ib98d7b082115db8b6787ff502e09e9945fd0996b
This commit is contained in:
Ronelle Landy 2019-11-05 13:39:04 -05:00
parent f0fb43a7af
commit c74b7c21d5
2 changed files with 4 additions and 4 deletions

View File

@ -28,8 +28,8 @@ undercloud_docker_insecure_registries: "{{ docker_registry_host }}"
docker_prep_prefix: rhel-binary
docker_ceph_namespace: docker.io/ceph
docker_openshift_tag: v3.11.0
overcloud_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/master/rdo_trunk/tripleo-ci-testing/overcloud-full.tar"
ipa_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/master/rdo_trunk/tripleo-ci-testing/ironic-python-agent.tar"
overcloud_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/master/rdo_trunk/current-tripleo/overcloud-full.tar"
ipa_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/master/rdo_trunk/current-tripleo/ironic-python-agent.tar"
repo_cmd_before: |
sudo rm -rf /etc/yum.repos.d/delorean*;
sudo rm -rf /etc/yum.repos.d/*.rpmsave;

View File

@ -28,8 +28,8 @@ undercloud_docker_insecure_registries: "{{ docker_registry_host }}"
docker_prep_prefix: rhel-binary
docker_ceph_namespace: docker.io/ceph
docker_openshift_tag: v3.11.0
overcloud_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/{{ release }}/rdo_trunk/tripleo-ci-testing/overcloud-full.tar"
ipa_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/{{ release }}/rdo_trunk/tripleo-ci-testing/ironic-python-agent.tar"
overcloud_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/{{ release }}/rdo_trunk/current-tripleo/overcloud-full.tar"
ipa_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/{{ release }}/rdo_trunk/current-tripleo/ironic-python-agent.tar"
repo_cmd_before: |
sudo rm -rf /etc/yum.repos.d/delorean*;
sudo rm -rf /etc/yum.repos.d/*.rpmsave;