diff --git a/install_puppet.sh b/install_puppet.sh
index 43605453c2..27d3af9a57 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -226,6 +226,11 @@ EOF
         --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
+    if [ -f /bin/systemctl ]; then
+        systemctl disable puppet
+    else
+        service puppet disable
+    fi
 }
 
 function setup_puppet_opensuse {
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 108254f1cf..89f64633e3 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -135,6 +135,25 @@ class openstack_project::server (
     require  => Class['pip'],
   }
 
+  ###########################################################
+  # Turn off puppet service
+
+  service { 'puppet':
+    ensure => stopped,
+    enable => false,
+  }
+
+  if $::osfamily == 'Debian' {
+    file { '/etc/default/puppet':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0444',
+      source  => 'puppet:///modules/openstack_project/puppet.default',
+      replace => true,
+    }
+  }
+
   class { 'openstack_project::template':
     iptables_public_tcp_ports => $iptables_public_tcp_ports,
     iptables_public_udp_ports => $iptables_public_udp_ports,
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 3bfe82348d..3d990b3afd 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -180,16 +180,6 @@ class openstack_project::template (
       source  => 'puppet:///modules/openstack_project/90no-translations',
       replace => true,
     }
-
-    file { '/etc/default/puppet':
-      ensure  => present,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      source  => 'puppet:///modules/openstack_project/puppet.default',
-      replace => true,
-    }
-
   }
 
   if ($::operatingsystem == 'CentOS') {
@@ -202,10 +192,6 @@ class openstack_project::template (
       replace => true,
     }
   }
-  service { 'puppet':
-    ensure => stopped,
-    enable => false,
-  }
 
   ###########################################################