From b9aa56cc8fca254ac984059055db0fb5608696b3 Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Thu, 26 Mar 2015 13:34:14 -0700 Subject: [PATCH] Remove templatedir directive from puppet.conf Puppet otherwise will send a deprecation warning about this Change-Id: If4febc534c780313226f0c251af4ed58b6faeb3b --- install_puppet.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/install_puppet.sh b/install_puppet.sh index f94f85ec12..47f25e1e49 100755 --- a/install_puppet.sh +++ b/install_puppet.sh @@ -79,6 +79,8 @@ function setup_puppet_fedora { # See upstream issue: # https://tickets.puppetlabs.com/browse/PUP-1082 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 { @@ -106,6 +108,8 @@ EOF # see comments in setup_puppet_fedora 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 { @@ -144,6 +148,8 @@ EOF # see comments in setup_puppet_fedora 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 { @@ -188,6 +194,8 @@ EOF --assume-yes dist-upgrade DEBIAN_FRONTEND=noninteractive apt-get --option 'Dpkg::Options::=--force-confold' \ --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 { @@ -195,6 +203,8 @@ function setup_puppet_opensuse { 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 --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 } #