Remove the password of openstack services in compass4nfv

JIRA: COMPASS-586

There are lots of hardcode about openstack service name and password.
We would generate the services password randomly when running role config-osa.

Change-Id: Ia0fec0c95a99d378febc837794e8ff550d10af4f
Signed-off-by: wutianwei <wutianwei1@huawei.com>

15 files changed, 112 insertions, 451 deletions

diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-ocata.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-ocata.conf
index 5771a645..cb467eee 100755
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-ocata.conf
+++ b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-ocata.conf
@@ -13,51 +13,51 @@ CONFIG_MAPPING = {
             "config": {
                 "rabbitmq": {
                     "username": "guest",
-                    "password": "guest"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "identity": {
                     "username": "keystone",
-                    "password": "keystone"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "alarming": {
                     "username": "aodh",
-                    "password": "aodh"
+                    "password": ""
                 },
                 "network": {
                     "username": "neutron",
-                    "password": "neutron"
+                    "password": ""
                 },
                 "mysql": {
                     "username": "root",
-                    "password": "root"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 },
                 "heat": {
                     "username": "heat",
-                    "password": "heat"
+                    "password": ""
                 },
                 "policy": {
                     "username": "congress",
-                    "password": "congress"
+                    "password": ""
                 }
             }
         }
@@ -72,51 +72,51 @@ CONFIG_MAPPING = {
             "config":{
                 "admin": {
                     "username": "admin",
-                    "password": "admin"
+                    "password": ""
                 },
                 "demo": {
                     "username": "demo",
-                    "password": "demo"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "identity": {
                     "username": "keystone",
-                    "password": "keystone"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "alarming": {
                     "username": "aodh",
-                    "password": "aodh"
+                    "password": ""
                 },
                 "network": {
                     "username": "quantum",
-                    "password": "quantum"
+                    "password": ""
                 },
                 "object-store": {
                     "username": "swift",
-                    "password": "swift"
+                    "password": ""
                 },
                 "heat": {
                    "username": "heat",
-                   "password": "heat"
+                   "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-pike.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-pike.conf
index d108c9b5..a205a5ed 100755
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-pike.conf
+++ b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-pike.conf
@@ -13,51 +13,51 @@ CONFIG_MAPPING = {
             "config": {
                 "rabbitmq": {
                     "username": "guest",
-                    "password": "guest"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "identity": {
                     "username": "keystone",
-                    "password": "keystone"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "alarming": {
                     "username": "aodh",
-                    "password": "aodh"
+                    "password": ""
                 },
                 "network": {
                     "username": "neutron",
-                    "password": "neutron"
+                    "password": ""
                 },
                 "mysql": {
                     "username": "root",
-                    "password": "root"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 },
                 "heat": {
                     "username": "heat",
-                    "password": "heat"
+                    "password": ""
                 },
                 "policy": {
                     "username": "congress",
-                    "password": "congress"
+                    "password": ""
                 }
             }
         }
@@ -72,51 +72,51 @@ CONFIG_MAPPING = {
             "config":{
                 "admin": {
                     "username": "admin",
-                    "password": "admin"
+                    "password": ""
                 },
                 "demo": {
                     "username": "demo",
-                    "password": "demo"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "identity": {
                     "username": "keystone",
-                    "password": "keystone"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "alarming": {
                     "username": "aodh",
-                    "password": "aodh"
+                    "password": ""
                 },
                 "network": {
                     "username": "quantum",
-                    "password": "quantum"
+                    "password": ""
                 },
                 "object-store": {
                     "username": "swift",
-                    "password": "swift"
+                    "password": ""
                 },
                 "heat": {
                    "username": "heat",
-                   "password": "heat"
+                   "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
diff --git a/deploy/compass_conf/flavor_mapping/allinone.conf b/deploy/compass_conf/flavor_mapping/allinone.conf
index 4752a805..11fadeaf 100755
--- a/deploy/compass_conf/flavor_mapping/allinone.conf
+++ b/deploy/compass_conf/flavor_mapping/allinone.conf
@@ -13,35 +13,35 @@ CONFIG_MAPPING = {
             "config": {
                 "rabbitmq": {
                     "username": "guest",
-                    "password": "guest"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "identity": {
                     "username": "keystone",
-                    "password": "keystone"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "mysql": {
                     "username": "root",
-                    "password": "root"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
@@ -56,35 +56,35 @@ CONFIG_MAPPING = {
             "config":{
                 "admin": {
                     "username": "admin",
-                    "password": "admin"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "network": {
                     "username": "quantum",
-                    "password": "quantum"
+                    "password": ""
                 },
                 "object-store": {
                     "username": "swift",
-                    "password": "swift"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
diff --git a/deploy/compass_conf/flavor_mapping/ha-multinodes.conf b/deploy/compass_conf/flavor_mapping/ha-multinodes.conf
index 34d76be1..1a3dc29f 100755
--- a/deploy/compass_conf/flavor_mapping/ha-multinodes.conf
+++ b/deploy/compass_conf/flavor_mapping/ha-multinodes.conf
@@ -13,35 +13,35 @@ CONFIG_MAPPING = {
             "config": {
                 "rabbitmq": {
                     "username": "guest",
-                    "password": "guest"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "identity": {
                     "username": "keystone",
-                    "password": "keystone"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "mysql": {
                     "username": "root",
-                    "password": "root"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
@@ -56,35 +56,35 @@ CONFIG_MAPPING = {
             "config":{
                 "admin": {
                     "username": "admin",
-                    "password": "admin"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "network": {
                     "username": "quantum",
-                    "password": "quantum"
+                    "password": ""
                 },
                 "object-store": {
                     "username": "swift",
-                    "password": "swift"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
diff --git a/deploy/compass_conf/flavor_mapping/multinodes.conf b/deploy/compass_conf/flavor_mapping/multinodes.conf
index bed52f06..003d7989 100755
--- a/deploy/compass_conf/flavor_mapping/multinodes.conf
+++ b/deploy/compass_conf/flavor_mapping/multinodes.conf
@@ -13,35 +13,35 @@ CONFIG_MAPPING = {
             "config": {
                 "rabbitmq": {
                     "username": "guest",
-                    "password": "guest"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "identity": {
                     "username": "keystone",
-                    "password": "keystone"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "mysql": {
                     "username": "root",
-                    "password": "root"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
@@ -56,35 +56,35 @@ CONFIG_MAPPING = {
             "config":{
                 "admin": {
                     "username": "admin",
-                    "password": "admin"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "network": {
                     "username": "quantum",
-                    "password": "quantum"
+                    "password": ""
                 },
                 "object-store": {
                     "username": "swift",
-                    "password": "swift"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
diff --git a/deploy/compass_conf/flavor_mapping/single-contoller-multi-compute.conf b/deploy/compass_conf/flavor_mapping/single-contoller-multi-compute.conf
index c7bbff73..26cc8610 100755
--- a/deploy/compass_conf/flavor_mapping/single-contoller-multi-compute.conf
+++ b/deploy/compass_conf/flavor_mapping/single-contoller-multi-compute.conf
@@ -13,35 +13,35 @@ CONFIG_MAPPING = {
             "config": {
                 "rabbitmq": {
                     "username": "guest",
-                    "password": "guest"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "identity": {
                     "username": "keystone",
-                    "password": "keystone"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "mysql": {
                     "username": "root",
-                    "password": "root"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
@@ -56,35 +56,35 @@ CONFIG_MAPPING = {
             "config":{
                 "admin": {
                     "username": "admin",
-                    "password": "admin"
+                    "password": ""
                 },
                 "compute": {
                     "username": "nova",
-                    "password": "nova"
+                    "password": ""
                 },
                 "dashboard": {
                     "username": "dashboard",
-                    "password": "dashboard"
+                    "password": ""
                 },
                 "image": {
                     "username": "glance",
-                    "password": "glance"
+                    "password": ""
                 },
                 "metering": {
                     "username": "ceilometer",
-                    "password": "ceilometer"
+                    "password": ""
                 },
                 "network": {
                     "username": "quantum",
-                    "password": "quantum"
+                    "password": ""
                 },
                 "object-store": {
                     "username": "swift",
-                    "password": "swift"
+                    "password": ""
                 },
                 "volume": {
                     "username": "cinder",
-                    "password": "cinder"
+                    "password": ""
                 }
             }
         }
diff --git a/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl b/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl
index f6d96c78..0d529561 100644
--- a/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl
@@ -94,31 +94,6 @@ host_index:
 #end for
 
 ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#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
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.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 aodh_dbpass = $credentials.alarming.password
-#set aodh_pass = $console_credentials.alarming.password
-#set congress_dbpass = $credentials.policy.password
-#set congress_pass = $console_credentials.policy.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
 
 cluster_name: $cluster_name
 
@@ -136,30 +111,6 @@ ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 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
-AODH_DBPASS: $aodh_dbpass
-AODH_PASS: $aodh_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-CONGRESS_DBPASS: $congress_dbpass
-CONGRESS_PASS: $congress_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
 #set plugins = $getVar('plugins', [])
 #for item in plugins
 #set keys = $item.keys()
@@ -195,10 +146,6 @@ build_in_image_name: cirros-0.3.3-x86_64-disk.img
 
 physical_device: /dev/sdb
 
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
 odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
 odl_pkg_name: karaf.tar.gz
 odl_home: "/opt/opendaylight-0.2.2/"
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
index 527f480a..d7a0e1b4 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
@@ -142,31 +142,6 @@ host_index:
 #end for
 
 ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#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
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.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 aodh_dbpass = $credentials.alarming.password
-#set aodh_pass = $console_credentials.alarming.password
-#set congress_dbpass = $credentials.policy.password
-#set congress_pass = $console_credentials.policy.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
 
 cluster_name: $cluster_name
 
@@ -184,30 +159,6 @@ ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 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
-AODH_DBPASS: $aodh_dbpass
-AODH_PASS: $aodh_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-CONGRESS_DBPASS: $congress_dbpass
-CONGRESS_PASS: $congress_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
 #set plugins = $getVar('plugins', [])
 #for item in plugins
 #set keys = $item.keys()
@@ -255,9 +206,6 @@ api_workers: 1
 
 physical_device: /dev/sdb
 
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
 
 odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
 odl_pkg_name: karaf.tar.gz
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/allinone.tmpl
index 2fc97c41..aa4d7e67 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/allinone.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/allinone.tmpl
@@ -17,20 +17,6 @@ INTERFACE_NAME: $network_external_nic
 INTERNAL_INTERFACE: $network_internal_nic
 #end for
 
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
 
 compute_controller_host: "{{ controller_host }}"
 db_host: "{{ controller_host }}"
@@ -55,20 +41,6 @@ ocata_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial
 ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
 NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
 NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
 #NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/multinodes.tmpl
index 9fa649bc..11f6fa79 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/multinodes.tmpl
@@ -86,21 +86,6 @@ INTERFACE_NAME: $network_external_nic
 INTERNAL_INTERFACE: $network_internal_nic
 #end for
 
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
 cluster_name: $cluster_name
 
 odl_controller: 10.1.0.15
@@ -116,20 +101,6 @@ ocata_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial
 ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
 NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
 NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
 #NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
@@ -151,9 +122,6 @@ physical_device: /dev/sdb
 internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
 internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
 HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
 
 odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
 odl_pkg_name: karaf.tar.gz
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/single-controller.tmpl
index 57c23366..e7544170 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/single-controller.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/single-controller.tmpl
@@ -29,21 +29,6 @@ INTERFACE_NAME: $network_external_nic
 INTERNAL_INTERFACE: $network_internal_nic
 #end for
 
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
 cluster_name: $cluster_name
 deploy_type: $getVar('deploy_type', 'virtual')
 compute_controller_host: "{{ controller_host }}"
@@ -67,20 +52,6 @@ ocata_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial
 ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
 NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
 NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
 #NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
@@ -103,6 +74,3 @@ physical_device: /dev/sdb
 internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
 internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
 HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/HA-ansible-multinodes.tmpl
index 6b226e6f..25deaa55 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/HA-ansible-multinodes.tmpl
@@ -142,31 +142,6 @@ host_index:
 #end for
 
 ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#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
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.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 aodh_dbpass = $credentials.alarming.password
-#set aodh_pass = $console_credentials.alarming.password
-#set congress_dbpass = $credentials.policy.password
-#set congress_pass = $console_credentials.policy.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
 
 cluster_name: $cluster_name
 
@@ -184,30 +159,6 @@ ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 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
-AODH_DBPASS: $aodh_dbpass
-AODH_PASS: $aodh_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-CONGRESS_DBPASS: $congress_dbpass
-CONGRESS_PASS: $congress_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
 #set plugins = $getVar('plugins', [])
 #for item in plugins
 #set keys = $item.keys()
@@ -255,8 +206,6 @@ api_workers: 1
 
 physical_device: /dev/sdb
 
-odl_username: admin
-odl_password: admin
 odl_api_port: 8080
 
 odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/allinone.tmpl
index 0fb6581f..31ea7be8 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/allinone.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/allinone.tmpl
@@ -17,20 +17,6 @@ INTERFACE_NAME: $network_external_nic
 INTERNAL_INTERFACE: $network_internal_nic
 #end for
 
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
 
 compute_controller_host: "{{ controller_host }}"
 db_host: "{{ controller_host }}"
@@ -55,20 +41,6 @@ pike_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-
 ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
 NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
 NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
 #NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
@@ -91,6 +63,3 @@ internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
 internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
 HA_VIP: "{{ internal_ip }}"
 
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/multinodes.tmpl
index 10056042..51f8295b 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/multinodes.tmpl
@@ -86,21 +86,6 @@ INTERFACE_NAME: $network_external_nic
 INTERNAL_INTERFACE: $network_internal_nic
 #end for
 
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
 cluster_name: $cluster_name
 
 odl_controller: 10.1.0.15
@@ -116,20 +101,6 @@ pike_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-
 ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
 NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
 NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
 #NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/single-controller.tmpl
index 08423749..3ffd9b2f 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/single-controller.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_pike/vars/single-controller.tmpl
@@ -29,20 +29,6 @@ INTERFACE_NAME: $network_external_nic
 INTERNAL_INTERFACE: $network_internal_nic
 #end for
 
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
 
 cluster_name: $cluster_name
 deploy_type: $getVar('deploy_type', 'virtual')
@@ -67,20 +53,6 @@ pike_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-
 ADMIN_TOKEN: admin
 CEILOMETER_TOKEN: c095d479023a0fd58a54
 
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
 NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
 NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
 #NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
@@ -103,6 +75,3 @@ physical_device: /dev/sdb
 internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
 internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
 HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080