diff --git a/modules.env b/modules.env
index 790e5ade43..e60cc77dc0 100644
--- a/modules.env
+++ b/modules.env
@@ -78,6 +78,7 @@ INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jenkins"]=
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-kerberos"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-pip"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-github"]="origin/master"
+INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-haveged"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-httpd"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-openstackid"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-planet"]="origin/master"
diff --git a/modules/haveged/manifests/init.pp b/modules/haveged/manifests/init.pp
deleted file mode 100644
index 0a5fb49ba6..0000000000
--- a/modules/haveged/manifests/init.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Install and run haveged to provide entropy
-class haveged {
-
-  package { 'haveged':
-    ensure => present,
-  }
-
-  service { 'haveged':
-    enable  => true,
-    require => Package[haveged],
-  }
-
-}