opendev/system-config
Code Issues Proposed changes

Merge "Remove templatedir directive from puppet.conf"

Browse Source
This commit is contained in:
Jenkins 2015-06-04 01:59:37 +00:00 committed by Gerrit Code Review
commit d28aa537ee
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install_puppet.sh
View File

@ -69,6 +69,8 @@ function setup_puppet_fedora {
# See upstream issue: # See upstream issue:
# https://tickets.puppetlabs.com/browse/PUP-1082 # https://tickets.puppetlabs.com/browse/PUP-1082
ln -fs /usr/bin/pip /usr/bin/pip-python ln -fs /usr/bin/pip /usr/bin/pip-python
# Wipe out templatedir so we don't get warnings about it
sed -i '/templatedir/d' /etc/puppet/puppet.conf
} }
function setup_puppet_rhel7 { function setup_puppet_rhel7 {
@ -98,6 +100,8 @@ EOF
# see comments in setup_puppet_fedora # see comments in setup_puppet_fedora
ln -s /usr/bin/pip /usr/bin/pip-python ln -s /usr/bin/pip /usr/bin/pip-python
# Wipe out templatedir so we don't get warnings about it
sed -i '/templatedir/d' /etc/puppet/puppet.conf
} }
function setup_puppet_rhel6 { function setup_puppet_rhel6 {
@ -136,6 +140,8 @@ EOF
# see comments in setup_puppet_fedora # see comments in setup_puppet_fedora
ln -s /usr/bin/pip /usr/bin/pip-python ln -s /usr/bin/pip /usr/bin/pip-python
# Wipe out templatedir so we don't get warnings about it
sed -i '/templatedir/d' /etc/puppet/puppet.conf
} }
function setup_puppet_ubuntu { function setup_puppet_ubuntu {
@ -180,6 +186,8 @@ EOF
--assume-yes dist-upgrade --assume-yes dist-upgrade
DEBIAN_FRONTEND=noninteractive apt-get --option 'Dpkg::Options::=--force-confold' \ DEBIAN_FRONTEND=noninteractive apt-get --option 'Dpkg::Options::=--force-confold' \
--assume-yes install -y --force-yes puppet git $rubypkg --assume-yes install -y --force-yes puppet git $rubypkg
# Wipe out templatedir so we don't get warnings about it
sed -i '/templatedir/d' /etc/puppet/puppet.conf
} }
function setup_puppet_opensuse { function setup_puppet_opensuse {
@ -187,6 +195,8 @@ function setup_puppet_opensuse {
zypper ar http://download.opensuse.org/repositories/systemsmanagement:/puppet/openSUSE_${version}/systemsmanagement:puppet.repo zypper ar http://download.opensuse.org/repositories/systemsmanagement:/puppet/openSUSE_${version}/systemsmanagement:puppet.repo
zypper -v --gpg-auto-import-keys --no-gpg-checks -n ref zypper -v --gpg-auto-import-keys --no-gpg-checks -n ref
zypper --non-interactive in --force-resolution puppet zypper --non-interactive in --force-resolution puppet
# Wipe out templatedir so we don't get warnings about it
sed -i '/templatedir/d' /etc/puppet/puppet.conf
} }
# #