diff --git a/conf/flavor_mapping/HA-ansible-multinodes-juno.conf b/conf/flavor_mapping/HA-ansible-multinodes-juno.conf
index 451b3aa5..ec69a418 100644
--- a/conf/flavor_mapping/HA-ansible-multinodes-juno.conf
+++ b/conf/flavor_mapping/HA-ansible-multinodes-juno.conf
@@ -27,6 +27,10 @@ CONFIG_MAPPING = {
                     "username": "keystone",
                     "password": "keystone"
                 },
+                "network": {
+                    "username": "network",
+                    "password": "network"
+                },
                 "image": {
                     "username": "glance",
                     "password": "glance"
@@ -62,6 +66,10 @@ CONFIG_MAPPING = {
                     "username": "admin",
                     "password": "admin"
                 },
+                "demo": {
+                    "username": "demo",
+                    "password": "demo"
+                },
                 "compute": {
                     "username": "nova",
                     "password": "nova"
@@ -70,6 +78,10 @@ CONFIG_MAPPING = {
                     "username": "dashboard",
                     "password": "dashboard"
                 },
+                "identity": {
+                    "username": "keystone",
+                    "password": "keystone"
+                },
                 "image": {
                     "username": "glance",
                     "password": "glance"
diff --git a/conf/flavor_mapping/HA-ansible-multinodes-kilo.conf b/conf/flavor_mapping/HA-ansible-multinodes-kilo.conf
index 68f00195..20be0239 100644
--- a/conf/flavor_mapping/HA-ansible-multinodes-kilo.conf
+++ b/conf/flavor_mapping/HA-ansible-multinodes-kilo.conf
@@ -31,6 +31,10 @@ CONFIG_MAPPING = {
                     "username": "glance",
                     "password": "glance"
                 },
+                "network": {
+                    "username": "neutron",
+                    "password": "neutron"
+                },
                 "metering": {
                     "username": "ceilometer",
                     "password": "ceilometer"
@@ -58,6 +62,10 @@ CONFIG_MAPPING = {
                     "username": "admin",
                     "password": "admin"
                 },
+                "demo": {
+                    "username": "demo",
+                    "password": "demo"
+                },
                 "compute": {
                     "username": "nova",
                     "password": "nova"
@@ -66,6 +74,10 @@ CONFIG_MAPPING = {
                     "username": "dashboard",
                     "password": "dashboard"
                 },
+                "identity": {
+                    "username": "keystone",
+                    "password": "keystone"
+                },
                 "image": {
                     "username": "glance",
                     "password": "glance"
diff --git a/conf/flavor_mapping/HA-ansible-multinodes-liberty.conf b/conf/flavor_mapping/HA-ansible-multinodes-liberty.conf
index d360c881..87843ed4 100644
--- a/conf/flavor_mapping/HA-ansible-multinodes-liberty.conf
+++ b/conf/flavor_mapping/HA-ansible-multinodes-liberty.conf
@@ -35,6 +35,10 @@ CONFIG_MAPPING = {
                     "username": "ceilometer",
                     "password": "ceilometer"
                 },
+                "network": {
+                    "username": "neutron",
+                    "password": "neutron"
+                },
                 "mysql": {
                     "username": "root",
                     "password": "root"
@@ -62,6 +66,10 @@ CONFIG_MAPPING = {
                     "username": "admin",
                     "password": "admin"
                 },
+                "demo": {
+                    "username": "demo",
+                    "password": "demo"
+                },
                 "compute": {
                     "username": "nova",
                     "password": "nova"
@@ -70,6 +78,10 @@ CONFIG_MAPPING = {
                     "username": "dashboard",
                     "password": "dashboard"
                 },
+                "identity": {
+                    "username": "keystone",
+                    "password": "keystone"
+                },
                 "image": {
                     "username": "glance",
                     "password": "glance"
diff --git a/conf/package_metadata/openstack.conf b/conf/package_metadata/openstack.conf
index d59f1cfe..45eeb182 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', 'rabbitmq', 'volume', 'mysql', 'heat']
+                '$service': ['image', 'compute', 'dashboard', 'identity', 'metering', 'network', 'rabbitmq', 'volume', 'mysql', 'heat']
                 },
                 'mapping_to': 'service_credentials'
             },
@@ -37,7 +37,7 @@ METADATA = {
             '_self': {
                 'required_in_whole_config': True,
                 'key_extensions': {
-                    '$console': ['admin', 'compute', 'dashboard', 'image', 'metering', 'network', 'object-store', 'volume', 'heat']
+                    '$console': ['admin', 'demo', 'compute', 'dashboard', 'image', 'identity', 'metering', 'network', 'object-store', 'volume', 'heat']
                 },
                 'mapping_to': 'console_credentials'
             },
diff --git a/conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl
index d41eca1b..5987f44d 100644
--- a/conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl
+++ b/conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl
@@ -95,9 +95,8 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
 #set console_credentials = $getVar('console_credentials', {})
 #set rabbit_username = $credentials.rabbitmq.username
 #set rabbit_password = $credentials.rabbitmq.password
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
 #set keystone_dbpass = $credentials.identity.password
+#set keystone_pass = $console_credentials.identity.password
 #set glance_dbpass = $credentials.image.password
 #set glance_pass = $console_credentials.image.password
 #set nova_dbpass = $credentials.compute.password
@@ -107,8 +106,12 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
 #set cinder_pass = $console_credentials.volume.password
 #set heat_dbpass = $credentials.heat.password
 #set heat_pass = $console_credentials.heat.password
-#set admin_pass = $console_credentials.admin.password
+#set neutron_dbpass = $credentials.network.password
 #set neutron_pass = $console_credentials.network.password
+#set ceilometer_dbpass = $credentials.metering.password
+#set ceilometer_pass = $console_credentials.metering.password
+#set admin_pass = $console_credentials.admin.password
+#set demo_pass = $console_credentials.demo.password
 
 cluster_name: $cluster_name
 
@@ -129,10 +132,9 @@ erlang.cookie: DJJVECFMCJPVYQTJTDWG
 RABBIT_USER: $rabbit_username
 RABBIT_PASS: $rabbit_password
 KEYSTONE_DBPASS: $keystone_dbpass
-CEILOMETER_DBPASS: service
-CEILOMETER_PASS: console
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
+KEYSTONE_PASS: $keystone_pass
+CEILOMETER_DBPASS: $ceilometer_dbpass
+CEILOMETER_PASS: $ceilometer_pass
 GLANCE_DBPASS: $glance_dbpass
 GLANCE_PASS: $glance_pass
 NOVA_DBPASS: $nova_dbpass
@@ -140,10 +142,12 @@ NOVA_PASS: $nova_pass
 DASH_DBPASS: $dash_dbpass
 CINDER_DBPASS: $cinder_dbpass
 CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
+NEUTRON_DBPASS: $neutron_dbpass
 NEUTRON_PASS: $neutron_pass
 HEAT_DBPASS: $heat_dbpass
 HEAT_PASS: $heat_pass
+DEMO_PASS: $demo_pass
+ADMIN_PASS: $admin_pass
 
 #set neutron_service_plugins=['router']
 
diff --git a/conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl
index d41eca1b..5987f44d 100644
--- a/conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl
+++ b/conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl
@@ -95,9 +95,8 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
 #set console_credentials = $getVar('console_credentials', {})
 #set rabbit_username = $credentials.rabbitmq.username
 #set rabbit_password = $credentials.rabbitmq.password
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
 #set keystone_dbpass = $credentials.identity.password
+#set keystone_pass = $console_credentials.identity.password
 #set glance_dbpass = $credentials.image.password
 #set glance_pass = $console_credentials.image.password
 #set nova_dbpass = $credentials.compute.password
@@ -107,8 +106,12 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
 #set cinder_pass = $console_credentials.volume.password
 #set heat_dbpass = $credentials.heat.password
 #set heat_pass = $console_credentials.heat.password
-#set admin_pass = $console_credentials.admin.password
+#set neutron_dbpass = $credentials.network.password
 #set neutron_pass = $console_credentials.network.password
+#set ceilometer_dbpass = $credentials.metering.password
+#set ceilometer_pass = $console_credentials.metering.password
+#set admin_pass = $console_credentials.admin.password
+#set demo_pass = $console_credentials.demo.password
 
 cluster_name: $cluster_name
 
@@ -129,10 +132,9 @@ erlang.cookie: DJJVECFMCJPVYQTJTDWG
 RABBIT_USER: $rabbit_username
 RABBIT_PASS: $rabbit_password
 KEYSTONE_DBPASS: $keystone_dbpass
-CEILOMETER_DBPASS: service
-CEILOMETER_PASS: console
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
+KEYSTONE_PASS: $keystone_pass
+CEILOMETER_DBPASS: $ceilometer_dbpass
+CEILOMETER_PASS: $ceilometer_pass
 GLANCE_DBPASS: $glance_dbpass
 GLANCE_PASS: $glance_pass
 NOVA_DBPASS: $nova_dbpass
@@ -140,10 +142,12 @@ NOVA_PASS: $nova_pass
 DASH_DBPASS: $dash_dbpass
 CINDER_DBPASS: $cinder_dbpass
 CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
+NEUTRON_DBPASS: $neutron_dbpass
 NEUTRON_PASS: $neutron_pass
 HEAT_DBPASS: $heat_dbpass
 HEAT_PASS: $heat_pass
+DEMO_PASS: $demo_pass
+ADMIN_PASS: $admin_pass
 
 #set neutron_service_plugins=['router']
 
diff --git a/conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl
index 5af5efba..5987f44d 100644
--- a/conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl
+++ b/conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl
@@ -132,6 +132,7 @@ erlang.cookie: DJJVECFMCJPVYQTJTDWG
 RABBIT_USER: $rabbit_username
 RABBIT_PASS: $rabbit_password
 KEYSTONE_DBPASS: $keystone_dbpass
+KEYSTONE_PASS: $keystone_pass
 CEILOMETER_DBPASS: $ceilometer_dbpass
 CEILOMETER_PASS: $ceilometer_pass
 GLANCE_DBPASS: $glance_dbpass