diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index c18ca02eba..f61605da23 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -71,11 +71,11 @@ class openstack_project::cacti (
   }
 
   $cacti_hosts = [
-    'ask.openstack.org',
     'afs01.dfw.openstack.org',
     'afs01.ord.openstack.org',
     'afsdb01.openstack.org',
     'afsdb02.openstack.org',
+    'ask.openstack.org',
     'eavesdrop.openstack.org',
     'elasticsearch01.openstack.org',
     'elasticsearch02.openstack.org',
@@ -84,8 +84,8 @@ class openstack_project::cacti (
     'elasticsearch05.openstack.org',
     'elasticsearch06.openstack.org',
     'elasticsearch07.openstack.org',
-    'etherpad.openstack.org',
     'etherpad-dev.openstack.org',
+    'etherpad.openstack.org',
     'git.openstack.org',
     'git01.openstack.org',
     'git02.openstack.org',
@@ -96,8 +96,9 @@ class openstack_project::cacti (
     'git07.openstack.org',
     'git08.openstack.org',
     'graphite.openstack.org',
-    'groups.openstack.org',
     'groups-dev.openstack.org',
+    'groups.openstack.org',
+    'jenkins-dev.openstack.org',
     'jenkins.openstack.org',
     'jenkins01.openstack.org',
     'jenkins02.openstack.org',
@@ -106,11 +107,9 @@ class openstack_project::cacti (
     'jenkins05.openstack.org',
     'jenkins06.openstack.org',
     'jenkins07.openstack.org',
-    'jenkins-dev.openstack.org',
     'kdc01.openstack.org',
     'kdc02.openstack.org',
     'lists.openstack.org',
-    'logstash.openstack.org',
     'logstash-worker01.openstack.org',
     'logstash-worker02.openstack.org',
     'logstash-worker03.openstack.org',
@@ -131,6 +130,7 @@ class openstack_project::cacti (
     'logstash-worker18.openstack.org',
     'logstash-worker19.openstack.org',
     'logstash-worker20.openstack.org',
+    'logstash.openstack.org',
     'nodepool.openstack.org',
     'openstackid.org',
     'paste.openstack.org',
@@ -138,13 +138,13 @@ class openstack_project::cacti (
     'planet.openstack.org',
     'puppetdb.openstack.org',
     'puppetmaster.openstack.org',
-    'pypi.openstack.org',
     'pypi.dfw.openstack.org',
     'pypi.iad.openstack.org',
+    'pypi.openstack.org',
     'pypi.ord.openstack.org',
     'pypi.region-b.geo-1.openstack.org',
-    'review.openstack.org',
     'review-dev.openstack.org',
+    'review.openstack.org',
     'static.openstack.org',
     'subunit-worker01.openstack.org',
     'wiki.openstack.org',