diff --git a/modules/openstack_project/files/cacti/create_graphs.sh b/modules/openstack_project/files/cacti/create_graphs.sh
index 83f56a0b45..ff75f990dc 100644
--- a/modules/openstack_project/files/cacti/create_graphs.sh
+++ b/modules/openstack_project/files/cacti/create_graphs.sh
@@ -65,14 +65,16 @@ add_ds_graph "Host MIB - Available Disk Space" "Available Disk Space" \
 SNMP_QUERY_ID=`php -q add_graphs.php --host-id=$HOST_ID --list-snmp-queries | \
     grep "SNMP - Interface Statistics"|cut -f 1`
 
+for $iface in $(php -q /usr/share/cacti/cli/add_graphs.php --host-id=$HOST_ID --snmp-field=ifName --list-snmp-values | grep -v tap| grep -v brq) ; do
 add_ds_graph "Interface - Traffic (bits/sec)" "In/Out Bits (64-bit Counters)" \
-    "ifOperStatus" "Up"
+    "ifName" "$iface"
 add_ds_graph "Interface - Errors/Discards" "In/Out Errors/Discarded Packets" \
-    "ifOperStatus" "Up"
+    "ifName" "$iface"
 add_ds_graph "Interface - Unicast Packets" "In/Out Unicast Packets" \
-    "ifOperStatus" "Up"
+    "ifName" "$iface"
 add_ds_graph "Interface - Non-Unicast Packets" "In/Out Non-Unicast Packets" \
-    "ifOperStatus" "Up"
+    "ifName" "$iface"
+done
 
 SNMP_QUERY_ID=`php -q add_graphs.php --host-id=$HOST_ID --list-snmp-queries | \
     grep "ucd/net - Get IO Devices"|cut -f 1`