diff --git a/doc/source/running-your-own.rst b/doc/source/running-your-own.rst
index f4e5b21ba3..828514cea4 100644
--- a/doc/source/running-your-own.rst
+++ b/doc/source/running-your-own.rst
@@ -73,8 +73,6 @@ The minimum set of things to port across is:
 
 * modules/openstack_project/manifests/params.pp
 
-* modules/openstack_project/manifests/puppet_cron.pp
-
 * modules/openstack_project/manifests/server.pp
 
 * modules/openstack_project/manifests/template.pp
diff --git a/manifests/site.pp b/manifests/site.pp
index 1f86a874c8..620c6a1c82 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,6 @@ $elasticsearch_nodes = [
 # Default: should at least behave like an openstack server
 #
 node default {
-  include openstack_project::puppet_cron
   class { 'openstack_project::server':
     sysadmins => hiera('sysadmins', ['admins']),
   }
@@ -640,49 +639,6 @@ node 'pypi.slave.openstack.org' {
   }
 }
 
-# Node-OS: precise
-node /^precise-dev\d+.*\.slave\.openstack\.org$/ {
-  include openstack_project
-  include openstack_project::puppet_cron
-  class { 'openstack_project::slave':
-    ssh_key   => $openstack_project::jenkins_dev_ssh_key,
-    sysadmins => hiera('sysadmins', ['admin']),
-  }
-}
-
-# Node-OS: precise
-node /^precisepy3k-dev\d+.*\.slave\.openstack\.org$/ {
-  include openstack_project
-  include openstack_project::puppet_cron
-  class { 'openstack_project::slave':
-    ssh_key      => $openstack_project::jenkins_dev_ssh_key,
-    sysadmins    => hiera('sysadmins', ['admin']),
-    python3      => true,
-    include_pypy => true,
-  }
-}
-
-# Node-OS: centos6
-node /^centos6-dev\d+\.slave\.openstack\.org$/ {
-  include openstack_project
-  include openstack_project::puppet_cron
-  class { 'openstack_project::slave':
-    ssh_key   => $openstack_project::jenkins_dev_ssh_key,
-    sysadmins => hiera('sysadmins', ['admin']),
-  }
-}
-
-# Node-OS: fedora18
-node /^fedora18-dev\d+\.slave\.openstack\.org$/ {
-  include openstack_project
-  include openstack_project::puppet_cron
-  class { 'openstack_project::slave':
-    ssh_key   => $openstack_project::jenkins_dev_ssh_key,
-    sysadmins => hiera('sysadmins', ['admin']),
-    python3   => true,
-  }
-}
-
 # Node-OS: precise
 node 'openstackid-dev.openstack.org' {
   class { 'openstack_project::openstackid_dev':
diff --git a/modules/openstack_project/manifests/puppet_cron.pp b/modules/openstack_project/manifests/puppet_cron.pp
deleted file mode 100644
index 2fa0bed039..0000000000
--- a/modules/openstack_project/manifests/puppet_cron.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# == Class: openstack_project::puppet_cron
-#
-class openstack_project::puppet_cron($ensure = present)
-{
-  include logrotate
-
-  class { 'puppetboot':
-    ensure => $ensure,
-  }
-  cron { 'updatepuppet':
-    ensure      => $ensure,
-    user        => 'root',
-    minute      => '*/15',
-    command     => "${::openstack_project::params::update_pkg_list_cmd}sleep $((RANDOM\%600)) && puppet agent --test >>/var/log/manifest.log",
-    environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin',
-  }
-  logrotate::file { 'updatepuppet':
-    ensure  => $ensure,
-    log     => '/var/log/manifest.log',
-    options => ['compress',
-      'delaycompress',
-      'missingok',
-      'rotate 7',
-      'daily',
-      'notifempty',
-    ],
-    require => Cron['updatepuppet'],
-  }
-}
diff --git a/modules/puppetboot/files/puppetboot.conf b/modules/puppetboot/files/puppetboot.conf
deleted file mode 100644
index 0361b5c566..0000000000
--- a/modules/puppetboot/files/puppetboot.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-author "Monty Taylor <mordred@inaugust.com>"
-description "Applying puppet config on boot"
-
-start on runlevel[2345]
-
-script
-  echo "Running puppet on boot" >> /var/log/manifest.log
-  date >> /var/log/manifest.log
-  /usr/bin/puppet agent --test >> /var/log/manifest.log
-end script
-
diff --git a/modules/puppetboot/manifests/init.pp b/modules/puppetboot/manifests/init.pp
deleted file mode 100644
index 82ac260ee8..0000000000
--- a/modules/puppetboot/manifests/init.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# == Class: puppetboot
-#
-class puppetboot($ensure=present) {
-  if ($::operatingsystem in ['CentOS', 'RedHat', 'Ubuntu']) {
-    file {'/etc/init/puppetboot.conf':
-      ensure => $ensure,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0644',
-      source => 'puppet:///modules/puppetboot/puppetboot.conf',
-    }
-  }
-}