diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index d8fe12b669..375e6c7b66 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -48,9 +48,19 @@ class openstack_project::cacti (
     require      => File["/var/lib/cacti/linux_host.xml"],
   }
 
-  class {'cacti_device': hostname=> "etherpad.openstack.org"}
-  class {'cacti_device': hostname=> "jenkins.openstack.org"}
-  class {'cacti_device': hostname=> "review.openstack.org"}
+  class {'cacti_device': hostname=> 'community.openstack.org'}
+  class {'cacti_device': hostname=> 'eavesdrop.openstack.org'}
+  class {'cacti_device': hostname=> 'etherpad.openstack.org'}
+  class {'cacti_device': hostname=> 'jenkins-dev.openstack.org'}
+  class {'cacti_device': hostname=> 'jenkins.openstack.org'}
+  class {'cacti_device': hostname=> 'lists.openstack.org'}
+  class {'cacti_device': hostname=> 'paste.openstack.org'}
+  class {'cacti_device': hostname=> 'planet.openstack.org'}
+  class {'cacti_device': hostname=> 'pypi.openstack.org'}
+  class {'cacti_device': hostname=> 'review-dev.openstack.org'}
+  class {'cacti_device': hostname=> 'review.openstack.org'}
+  class {'cacti_device': hostname=> 'static.openstack.org'}
+  class {'cacti_device': hostname=> 'wiki.openstack.org'}
 }
 
 class cacti_device(