diff --git a/modules/openstack_project/files/cacti/create_graphs.sh b/modules/openstack_project/files/cacti/create_graphs.sh
index 8f15132ad1..3ca64245fc 100644
--- a/modules/openstack_project/files/cacti/create_graphs.sh
+++ b/modules/openstack_project/files/cacti/create_graphs.sh
@@ -72,12 +72,9 @@ add_ds_graph "Interface - Non-Unicast Packets" "In/Out Non-Unicast Packets" \
 SNMP_QUERY_ID=`php -q add_graphs.php --host-id=$HOST_ID --list-snmp-queries | \
   grep "ucd/net - Get IO Devices"|cut -f 1`
 
-add_ds_graph "ucd/net - Device IO - Operations" "IO Operations" \
-  "diskIODevice" "xvda"
-add_ds_graph "ucd/net - Device IO - Throughput" "IO Throughput" \
-  "diskIODevice" "xvda"
-
-add_ds_graph "ucd/net - Device IO - Operations" "IO Operations" \
-  "diskIODevice" "xvdc"
-add_ds_graph "ucd/net - Device IO - Throughput" "IO Throughput" \
-  "diskIODevice" "xvdc"
+for disk in $(php -q add_graphs.php --host-id=$HOST_ID --snmp-field=diskIODevice --list-snmp-values | grep xvd[a-z]$) ; do
+    add_ds_graph "ucd/net - Device IO - Operations" "IO Operations" \
+        "diskIODevice" "$disk"
+    add_ds_graph "ucd/net - Device IO - Throughput" "IO Throughput" \
+        "diskIODevice" "$disk"
+done
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index 3f6c6baae7..f364d6e3f1 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -19,7 +19,7 @@ class openstack_project::cacti (
     ensure => present,
   }
 
-  file { '/etc/apache2/conf-available/cacti.conf':
+  file { '/etc/apache2/conf.d/cacti.conf':
     ensure  => present,
     source  => 'puppet:///modules/openstack_project/cacti/apache.conf',
     mode    => '0644',