diff --git a/modules.env b/modules.env
index 3ef333bf14..dfaa0fe27c 100644
--- a/modules.env
+++ b/modules.env
@@ -60,6 +60,7 @@ INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-accessbot"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ansible"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-asterisk"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-bup"]="origin/master"
+INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-bugdaystats"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elasticsearch"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-etherpad_lite"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elastic_recheck"]="origin/master"
diff --git a/modules/bugdaystats/files/config.js b/modules/bugdaystats/files/config.js
deleted file mode 100644
index f8b9123474..0000000000
--- a/modules/bugdaystats/files/config.js
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "projects": [
-        { "project": "nova", "height": 380 },
-        { "project": "glance" },
-        { "project": "keystone" },
-        { "project": "neutron" },
-        { "project": "cinder" },
-        { "project": "horizon" },
-        { "project": "sahara" },
-        { "project": "swift" },
-        { "project": "openstack-manuals", "title": "Manuals" },
-        { "project": "openstack-api-site", "title": "API Site" },
-        { "project": "tempest" }
-    ],
-    "openstack_status": 1,
-    "rotation": 3
-}
diff --git a/modules/bugdaystats/manifests/init.pp b/modules/bugdaystats/manifests/init.pp
deleted file mode 100644
index abc2a7821d..0000000000
--- a/modules/bugdaystats/manifests/init.pp
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# Class: bugdaystats
-#
-class bugdaystats {
-  if ! defined(Package['python-launchpadlib']) {
-    package { 'python-launchpadlib':
-      ensure => present,
-    }
-  }
-
-  if ! defined(Package['python-jinja2']) {
-    package { 'python-jinja2':
-      ensure => present,
-    }
-  }
-
-  if ! defined(Package['python-simplejson']) {
-    package { 'python-simplejson':
-      ensure => present,
-    }
-  }
-
-  group { 'bugdaystats':
-    ensure => present,
-  }
-
-  user { 'bugdaystats':
-    ensure     => present,
-    home       => '/var/lib/bugdaystats',
-    shell      => '/bin/bash',
-    gid        => 'bugdaystats',
-    managehome => true,
-    require    => Group['bugdaystats'],
-  }
-
-  file { '/var/lib/bugdaystats':
-    ensure  => directory,
-    owner   => 'bugdaystats',
-    group   => 'bugdaystats',
-    mode    => '0755',
-    require => User['bugdaystats'],
-  }
-}
diff --git a/modules/bugdaystats/manifests/site.pp b/modules/bugdaystats/manifests/site.pp
deleted file mode 100644
index e40f9afcf9..0000000000
--- a/modules/bugdaystats/manifests/site.pp
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# == Define: bugdaystats
-#
-define bugdaystats::site(
-  $git_url = '',
-  $configfile = '',
-  $httproot = '',
-  $serveradmin = ''
-) {
-  file { $configfile:
-    mode    => '0444',
-    source  => 'puppet:///modules/bugdaystats/config.js',
-    require => File['/var/lib/bugdaystats'],
-  }
-
-  file { $httproot:
-    ensure  => directory,
-    owner   => 'bugdaystats',
-    group   => 'bugdaystats',
-    mode    => '0755',
-  }
-
-  vcsrepo { '/var/lib/bugdaystats/bugdaystats':
-    ensure   => latest,
-    provider => git,
-    source   => 'https://git.openstack.org/openstack-infra/bugdaystats',
-    revision => 'master',
-    require  => File['/var/lib/bugdaystats'],
-  }
-
-  file { "${httproot}/js":
-    ensure  => link,
-    target  => '/var/lib/bugdaystats/bugdaystats/output/js',
-    require => Vcsrepo['/var/lib/bugdaystats/bugdaystats'],
-  }
-
-  file { '/var/lib/bugdaystats/bugdaystats/config.js':
-    ensure  => link,
-    target  => $configfile,
-    require => Vcsrepo['/var/lib/bugdaystats/bugdaystats'],
-  }
-
-  cron { 'update bugdaystats':
-    command => "/var/lib/bugdaystats/bugdaystats/bugdaystats.py ${httproot}",
-    minute  => '*/30',
-    user    => 'bugdaystats',
-  }
-}