diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index 3993fde..257b567 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -63,6 +63,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index 0f3e48c..d09a5be 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -63,6 +63,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/init.yml b/classes/cluster/virtual-mcp05-dvr/openstack/init.yml
index 4bd5ae1..4e1133c 100644
--- a/classes/cluster/virtual-mcp05-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/init.yml
@@ -61,6 +61,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/init.yml b/classes/cluster/virtual-mcp05-ovs/openstack/init.yml
index a6f550c..a557f04 100644
--- a/classes/cluster/virtual-mcp05-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/init.yml
@@ -61,6 +61,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
index ef4ae20..f5683a3 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
@@ -62,6 +62,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/init.yml b/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
index e7e6025..a7101a0 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
@@ -62,6 +62,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
index 50133cd..fdca4e8 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
@@ -63,6 +63,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
index e5c0b06..7bacbda 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
@@ -75,6 +75,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
index 8d97267..f236661 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
@@ -63,6 +63,7 @@
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
+    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
diff --git a/classes/system b/classes/system
index 65ae6c9..34e2661 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 65ae6c91bbe72c4b176631588f56c7e918d7fc73
+Subproject commit 34e266192bab45db3584cd78fcdcf3dc1717c610