diff --git a/manifests/site.pp b/manifests/site.pp
index f746f14d8e..8c86ad1992 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -230,14 +230,24 @@ node 'puppetdb.openstack.org' {
 
 # Node-OS: precise
 node 'graphite.openstack.org' {
-  class { 'openstack_project::graphite':
-    sysadmins               => hiera('sysadmins', []),
+  $statsd_hosts = ['logstash.openstack.org',
+                   'nodepool.openstack.org',
+                   'zuul.openstack.org']
+
+  # Turn a list of hostnames into a list of iptables rules
+  $rules = regsubst ($statsd_hosts, '^(.*)$', '-m udp -p udp -s \1 --dport 8125 -j ACCEPT')
+
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80, 443],
+    iptables_rules6           => $rules,
+    iptables_rules4           => $rules,
+    sysadmins                 => hiera('sysadmins', [])
+  }
+
+  class { '::graphite':
     graphite_admin_user     => hiera('graphite_admin_user', 'username'),
     graphite_admin_email    => hiera('graphite_admin_email', 'email@example.com'),
     graphite_admin_password => hiera('graphite_admin_password', 'XXX'),
-    statsd_hosts            => ['logstash.openstack.org',
-                                'nodepool.openstack.org',
-                                'zuul.openstack.org'],
   }
 }
 
diff --git a/modules/openstack_project/manifests/graphite.pp b/modules/openstack_project/manifests/graphite.pp
deleted file mode 100644
index e27f59890c..0000000000
--- a/modules/openstack_project/manifests/graphite.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# Class to configure graphite on a node.
-class openstack_project::graphite (
-  $sysadmins = [],
-  $graphite_admin_user = '',
-  $graphite_admin_email = '',
-  $graphite_admin_password ='',
-  $statsd_hosts = [],
-) {
-
-  # Turn a list of hostnames into a list of iptables rules
-  $rules = regsubst ($statsd_hosts, '^(.*)$', '-m udp -p udp -s \1 --dport 8125 -j ACCEPT')
-
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80, 443],
-    iptables_rules6           => $rules,
-    iptables_rules4           => $rules,
-    sysadmins                 => $sysadmins,
-  }
-
-  class { '::graphite':
-    graphite_admin_user     => $graphite_admin_user,
-    graphite_admin_email    => $graphite_admin_email,
-    graphite_admin_password => $graphite_admin_password,
-  }
-}