openstack
/
tripleo-ci
Code Issues Proposed changes

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
This commit is contained in:
Ben Nemec 2017-05-01 20:07:21 +00:00 committed by Sagi Shnaidman
parent 36f86a2c98
commit ca5f796c8c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bootstrap-overcloud-full.sh
View File

@ -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

2
scripts/quickstart/prepare_slave.yml
View File

@ -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;

2
toci-quickstart/playbooks/prepare_slave.yml
View File

@ -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;

4
toci_instack_osinfra.sh
View File

@ -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 \

2
toci_instack_ovb.sh
View File

@ -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."