diff --git a/conf/flavor_mapping/HA-ansible-multinodes-mitaka.conf b/conf/flavor_mapping/HA-ansible-multinodes-mitaka.conf
index 539c0a4c..a2ba1c1f 100644
--- a/conf/flavor_mapping/HA-ansible-multinodes-mitaka.conf
+++ b/conf/flavor_mapping/HA-ansible-multinodes-mitaka.conf
@@ -35,6 +35,10 @@ CONFIG_MAPPING = {
                     "username": "ceilometer",
                     "password": "ceilometer"
                 },
+                "alarming": {
+                    "username": "aodh",
+                    "password": "aodh"
+                },
                 "network": {
                     "username": "neutron",
                     "password": "neutron"
@@ -90,6 +94,10 @@ CONFIG_MAPPING = {
                     "username": "ceilometer",
                     "password": "ceilometer"
                 },
+                "alarming": {
+                    "username": "aodh",
+                    "password": "aodh"
+                },
                 "network": {
                     "username": "quantum",
                     "password": "quantum"
diff --git a/conf/package_metadata/openstack.conf b/conf/package_metadata/openstack.conf
index 6bd1a26e..59fafc58 100644
--- a/conf/package_metadata/openstack.conf
+++ b/conf/package_metadata/openstack.conf
@@ -8,7 +8,7 @@ METADATA = {
             '_self': {
                 'required_in_whole_config': True,
                 'key_extensions': {
-                '$service': ['image', 'compute', 'dashboard', 'identity', 'metering', 'network', 'rabbitmq', 'volume', 'mysql', 'heat']
+                '$service': ['image', 'compute', 'dashboard', 'identity', 'metering', 'network', 'rabbitmq', 'volume', 'mysql', 'heat', 'alarming']
                 },
                 'mapping_to': 'service_credentials'
             },
@@ -37,7 +37,7 @@ METADATA = {
             '_self': {
                 'required_in_whole_config': True,
                 'key_extensions': {
-                    '$console': ['admin', 'demo', 'compute', 'dashboard', 'image', 'identity', 'metering', 'network', 'object-store', 'volume', 'heat']
+                    '$console': ['admin', 'demo', 'compute', 'dashboard', 'image', 'identity', 'metering', 'network', 'object-store', 'volume', 'heat', 'alarming']
                 },
                 'mapping_to': 'console_credentials'
             },