diff --git a/install_puppet.sh b/install_puppet.sh
index 0d787e3103..cee0cc5f22 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -69,6 +69,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 {
@@ -98,6 +100,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 {
@@ -136,6 +140,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 {
@@ -180,6 +186,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 {
@@ -187,6 +195,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
 }
 
 #