openstack
/
tripleo-ci
Code Issues Proposed changes

Remove centos-release-openstack-* in nodes preparation 

Currently, tripleo-ci scrips clean up repos removing rdo-release
rpm, but https://review.openstack.org/#/c/453325 moved base image to
use centos openstack release rpm instead of rdo-release.

This patch removes all centos-release-openstack packages in addition
to rdo-release. Note that yum returns 0 even if no matching packages
are found so this should be ok.

Change-Id: I825038eeb134590fe9bb68697a193e5c6626f991
Closes-Bug: #1685418
This commit is contained in:
Alfredo Moralejo 2017-04-24 20:30:15 +02:00
parent 586f720ff8
commit 16b35e0950
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 @@ fi
# 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
sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-*
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;
sudo yum remove -y puppet hiera puppetlabs-release rdo-release centos-release-openstack-*;
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;
sudo yum remove -y puppet hiera puppetlabs-release rdo-release centos-release-openstack-*;
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
sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-*
sudo rm -rf /etc/puppet /etc/hiera.yaml
# Setup delorean
@ -79,7 +79,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
sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-*
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
sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-*
sudo rm -rf /etc/puppet /etc/hiera.yaml
undercloud_net_range="192.168.24."