diff --git a/hiera/common.yaml b/hiera/common.yaml
index d78962b3fa..ca20ab05b6 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -241,151 +241,8 @@ cacti_hosts:
 - apps.openstack.org
 - ask.openstack.org
 - backup01.ord.rax.ci.openstack.org
-- baremetal00.vanilla.ic.openstack.org
 - bridge.openstack.org
 - cacti.openstack.org
-- controller00.vanilla.ic.openstack.org
-- compute000.vanilla.ic.openstack.org
-- compute001.vanilla.ic.openstack.org
-- compute002.vanilla.ic.openstack.org
-- compute003.vanilla.ic.openstack.org
-- compute004.vanilla.ic.openstack.org
-- compute005.vanilla.ic.openstack.org
-- compute006.vanilla.ic.openstack.org
-- compute007.vanilla.ic.openstack.org
-- compute008.vanilla.ic.openstack.org
-- compute009.vanilla.ic.openstack.org
-- compute010.vanilla.ic.openstack.org
-- compute011.vanilla.ic.openstack.org
-- compute012.vanilla.ic.openstack.org
-- compute013.vanilla.ic.openstack.org
-- compute014.vanilla.ic.openstack.org
-- compute015.vanilla.ic.openstack.org
-- compute016.vanilla.ic.openstack.org
-- compute017.vanilla.ic.openstack.org
-- compute018.vanilla.ic.openstack.org
-- compute019.vanilla.ic.openstack.org
-- compute020.vanilla.ic.openstack.org
-- compute021.vanilla.ic.openstack.org
-- compute022.vanilla.ic.openstack.org
-- compute023.vanilla.ic.openstack.org
-- compute024.vanilla.ic.openstack.org
-- compute025.vanilla.ic.openstack.org
-- compute026.vanilla.ic.openstack.org
-- compute027.vanilla.ic.openstack.org
-- compute028.vanilla.ic.openstack.org
-- compute030.vanilla.ic.openstack.org
-- compute031.vanilla.ic.openstack.org
-- compute032.vanilla.ic.openstack.org
-- compute033.vanilla.ic.openstack.org
-- compute034.vanilla.ic.openstack.org
-- compute035.vanilla.ic.openstack.org
-- compute036.vanilla.ic.openstack.org
-- compute037.vanilla.ic.openstack.org
-- compute038.vanilla.ic.openstack.org
-- compute039.vanilla.ic.openstack.org
-- compute040.vanilla.ic.openstack.org
-- compute041.vanilla.ic.openstack.org
-- compute042.vanilla.ic.openstack.org
-- compute043.vanilla.ic.openstack.org
-- compute044.vanilla.ic.openstack.org
-- compute045.vanilla.ic.openstack.org
-- controller00.chocolate.ic.openstack.org
-- compute000.chocolate.ic.openstack.org
-- compute001.chocolate.ic.openstack.org
-- compute002.chocolate.ic.openstack.org
-- compute003.chocolate.ic.openstack.org
-- compute004.chocolate.ic.openstack.org
-- compute005.chocolate.ic.openstack.org
-- compute006.chocolate.ic.openstack.org
-- compute007.chocolate.ic.openstack.org
-- compute008.chocolate.ic.openstack.org
-- compute009.chocolate.ic.openstack.org
-- compute010.chocolate.ic.openstack.org
-- compute011.chocolate.ic.openstack.org
-- compute012.chocolate.ic.openstack.org
-- compute013.chocolate.ic.openstack.org
-- compute014.chocolate.ic.openstack.org
-- compute015.chocolate.ic.openstack.org
-- compute016.chocolate.ic.openstack.org
-- compute017.chocolate.ic.openstack.org
-- compute018.chocolate.ic.openstack.org
-- compute019.chocolate.ic.openstack.org
-- compute020.chocolate.ic.openstack.org
-- compute021.chocolate.ic.openstack.org
-- compute022.chocolate.ic.openstack.org
-- compute023.chocolate.ic.openstack.org
-- compute024.chocolate.ic.openstack.org
-- compute025.chocolate.ic.openstack.org
-- compute026.chocolate.ic.openstack.org
-- compute027.chocolate.ic.openstack.org
-- compute028.chocolate.ic.openstack.org
-- compute029.chocolate.ic.openstack.org
-- compute030.chocolate.ic.openstack.org
-- compute031.chocolate.ic.openstack.org
-- compute032.chocolate.ic.openstack.org
-- compute033.chocolate.ic.openstack.org
-- compute034.chocolate.ic.openstack.org
-- compute035.chocolate.ic.openstack.org
-- compute036.chocolate.ic.openstack.org
-- compute037.chocolate.ic.openstack.org
-- compute038.chocolate.ic.openstack.org
-- compute039.chocolate.ic.openstack.org
-- compute040.chocolate.ic.openstack.org
-- compute041.chocolate.ic.openstack.org
-- compute042.chocolate.ic.openstack.org
-- compute043.chocolate.ic.openstack.org
-- compute044.chocolate.ic.openstack.org
-- compute045.chocolate.ic.openstack.org
-- compute046.chocolate.ic.openstack.org
-- compute047.chocolate.ic.openstack.org
-- compute048.chocolate.ic.openstack.org
-- compute049.chocolate.ic.openstack.org
-- compute050.chocolate.ic.openstack.org
-- compute051.chocolate.ic.openstack.org
-- compute052.chocolate.ic.openstack.org
-- compute053.chocolate.ic.openstack.org
-- compute054.chocolate.ic.openstack.org
-- compute055.chocolate.ic.openstack.org
-- compute056.chocolate.ic.openstack.org
-- compute057.chocolate.ic.openstack.org
-- compute058.chocolate.ic.openstack.org
-- compute059.chocolate.ic.openstack.org
-- compute060.chocolate.ic.openstack.org
-- compute061.chocolate.ic.openstack.org
-- compute062.chocolate.ic.openstack.org
-- compute063.chocolate.ic.openstack.org
-- compute064.chocolate.ic.openstack.org
-- compute065.chocolate.ic.openstack.org
-- compute066.chocolate.ic.openstack.org
-- compute067.chocolate.ic.openstack.org
-- compute068.chocolate.ic.openstack.org
-- compute069.chocolate.ic.openstack.org
-- compute070.chocolate.ic.openstack.org
-- compute071.chocolate.ic.openstack.org
-- compute072.chocolate.ic.openstack.org
-- compute073.chocolate.ic.openstack.org
-- compute074.chocolate.ic.openstack.org
-- compute075.chocolate.ic.openstack.org
-- compute076.chocolate.ic.openstack.org
-- compute077.chocolate.ic.openstack.org
-- compute078.chocolate.ic.openstack.org
-- compute079.chocolate.ic.openstack.org
-- compute080.chocolate.ic.openstack.org
-- compute081.chocolate.ic.openstack.org
-- compute082.chocolate.ic.openstack.org
-- compute083.chocolate.ic.openstack.org
-- compute084.chocolate.ic.openstack.org
-- compute085.chocolate.ic.openstack.org
-- compute086.chocolate.ic.openstack.org
-- compute087.chocolate.ic.openstack.org
-- compute088.chocolate.ic.openstack.org
-- compute089.chocolate.ic.openstack.org
-- compute090.chocolate.ic.openstack.org
-- compute091.chocolate.ic.openstack.org
-- compute092.chocolate.ic.openstack.org
-- compute093.chocolate.ic.openstack.org
-- compute094.chocolate.ic.openstack.org
 - eavesdrop.openstack.org
 - elasticsearch01.openstack.org
 - elasticsearch02.openstack.org
diff --git a/modules/openstack_project/files/cacti/create_graphs.sh b/modules/openstack_project/files/cacti/create_graphs.sh
index 20793fe4ca..c773adcd06 100644
--- a/modules/openstack_project/files/cacti/create_graphs.sh
+++ b/modules/openstack_project/files/cacti/create_graphs.sh
@@ -12,13 +12,7 @@ php -q add_device.php --description="$HOST_NAME" --ip="$HOST_NAME" \
 
 HOST_ID=`php -q add_graphs.php --list-hosts |grep -P "\t$HOST_NAME"|cut -f 1`
 
-if [[ $HOST_NAME =~ vanilla\.ic\.openstack\.org ]]; then
-    TREE_NAME='Infra Cloud Vanilla'
-elif [[ $HOST_NAME =~ chocolate\.ic\.openstack\.org ]]; then
-    TREE_NAME='Infra Cloud Chocolate'
-else
-    TREE_NAME='All Hosts'
-fi
+TREE_NAME='All Hosts'
 
 TREE_ID=`php -q add_tree.php --list-trees |grep "$TREE_NAME"|cut -f 1`
 php -q add_tree.php --type=node --node-type=host --tree-id=$TREE_ID \