From ca5f796c8cf36bd286786a17f10b9a1b4a0527b9 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Mon, 1 May 2017 20:07:21 +0000
Subject: [PATCH] Remove all centos-release-* repos

We shouldn't be using packages from any of these, and they can cause
package conflicts with the delorean repos we do want to use.

For some reason centos-release-* also matches the base centos-release
package, so we need to explicitly match only packages where the
following characters are a-z.

Change-Id: I928a0efc9d75e584889967e262155e576452632d
Closes-Bug: 1685814
---
 scripts/bootstrap-overcloud-full.sh         | 2 +-
 scripts/quickstart/prepare_slave.yml        | 2 +-
 toci-quickstart/playbooks/prepare_slave.yml | 2 +-
 toci_instack_osinfra.sh                     | 4 ++--
 toci_instack_ovb.sh                         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-overcloud-full.sh b/scripts/bootstrap-overcloud-full.sh
index ae325c9fd..7ff74b466 100755
--- a/scripts/bootstrap-overcloud-full.sh
+++ b/scripts/bootstrap-overcloud-full.sh
@@ -25,7 +25,7 @@ sudo yum -y install python-requests
 
 # Remove the anything on the infra image template that might interfere with CI
 # Note for tripleo-quickstart: this task is already managed in tripleo-ci-setup-playbook.yml
-sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-* centos-release-ceph-*
+sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-[a-z]*
 sudo rm -rf /etc/puppet /etc/hiera.yaml
 
 # Update everything
diff --git a/scripts/quickstart/prepare_slave.yml b/scripts/quickstart/prepare_slave.yml
index 07581bbd4..05771d6f8 100644
--- a/scripts/quickstart/prepare_slave.yml
+++ b/scripts/quickstart/prepare_slave.yml
@@ -16,7 +16,7 @@
         fi;
         cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys | tee -a ~/.ssh/authorized_keys;
 
-        sudo yum remove -y puppet hiera puppetlabs-release rdo-release centos-release-openstack-* centos-release-ceph-*;
+        sudo yum remove -y puppet hiera puppetlabs-release rdo-release centos-release-[a-z]*;
         sudo rm -rf /etc/puppet /etc/hiera.yaml;
         sudo cp {{tripleo_root}}/tripleo-ci/test-environments/overcloud-cacert.pem /etc/pki/ca-trust/source/anchors/;
         sudo update-ca-trust extract;
diff --git a/toci-quickstart/playbooks/prepare_slave.yml b/toci-quickstart/playbooks/prepare_slave.yml
index 07581bbd4..05771d6f8 100644
--- a/toci-quickstart/playbooks/prepare_slave.yml
+++ b/toci-quickstart/playbooks/prepare_slave.yml
@@ -16,7 +16,7 @@
         fi;
         cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys | tee -a ~/.ssh/authorized_keys;
 
-        sudo yum remove -y puppet hiera puppetlabs-release rdo-release centos-release-openstack-* centos-release-ceph-*;
+        sudo yum remove -y puppet hiera puppetlabs-release rdo-release centos-release-[a-z]*;
         sudo rm -rf /etc/puppet /etc/hiera.yaml;
         sudo cp {{tripleo_root}}/tripleo-ci/test-environments/overcloud-cacert.pem /etc/pki/ca-trust/source/anchors/;
         sudo update-ca-trust extract;
diff --git a/toci_instack_osinfra.sh b/toci_instack_osinfra.sh
index 1dadab0fc..8406a1ac4 100755
--- a/toci_instack_osinfra.sh
+++ b/toci_instack_osinfra.sh
@@ -32,7 +32,7 @@ cp /etc/nodepool/id_rsa.pub  ~/.ssh/
 
 # Remove the anything on the infra image template that might interfere with CI
 # Note for tripleo-quickstart: this task is already managed in tripleo-ci-setup-playbook.yml
-sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-* centos-release-ceph-*
+sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-[a-z]*
 sudo rm -rf /etc/puppet /etc/hiera.yaml
 
 # Setup delorean
@@ -80,7 +80,7 @@ if [ -s /etc/nodepool/sub_nodes ]; then
     for ip in $(cat /etc/nodepool/sub_nodes); do
         sanitized_address=$(sanitize_ip_address $ip)
         ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
-            sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-* centos-release-ceph-*
+            sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-[a-z]*
         ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
             sudo rm -rf /etc/puppet /etc/hiera.yaml
         ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
diff --git a/toci_instack_ovb.sh b/toci_instack_ovb.sh
index 9251e9c55..375451780 100755
--- a/toci_instack_ovb.sh
+++ b/toci_instack_ovb.sh
@@ -33,7 +33,7 @@ sudo yum install -yq jq
 
 # Remove the anything on the infra image template that might interfere with CI
 # Note for tripleo-quickstart: this task is already managed in tripleo-ci-setup-playbook.yml
-sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-* centos-release-ceph-*
+sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-[a-z]*
 sudo rm -rf /etc/puppet /etc/hiera.yaml
 
 undercloud_net_range="192.168.24."