openstack/project-config
Code Issues Proposed changes

Don't remove puppet in puppet prep macro.

Browse Source 
We are running into errors when attempting to uninstal hiera on trusty
jobs because the hiera package does not exist. We no longer install
puppet as part of our image build process so we shouldn't need to
uninstall puppet, hiera, and facter at all. Simply drop the the removals
to address this as there is nothing to remove any longer.

Change-Id: I1ce79f3f7dd164e0635a4ae45210194f50ab8ad9
This commit is contained in:
Clark Boylan 2017-09-20 10:08:38 -07:00
parent 7cdae92cec
commit d0c95bb642
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/macros.yaml
View File

@ -521,19 +521,15 @@
- shell: |
#!/bin/bash -xe
if [ -f /usr/bin/yum ]; then
sudo yum -y remove facter puppet hiera rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
sudo yum -y groupinstall "Development Tools"
# Uninstall python-requests from pip, since we install it in
# system-config/install_puppet.sh
sudo pip uninstall requests -y || true
elif [ -f /usr/bin/apt-get ]; then
sudo apt-get remove -y --purge facter puppet puppet-common hiera
sudo apt-get update
sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev
# /etc/default/puppet is not purged when removing Puppet
# but need to be dropped if we want to re-install puppet-agent on Xenial
sudo rm -rf /etc/default/puppet
fi
- builder: