From caed53bb82bbdf3fcae7abe6753618af05eafe25 Mon Sep 17 00:00:00 2001 From: wutianwei Date: Tue, 6 Mar 2018 11:15:33 +0800 Subject: 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 --- .../openstack_ocata/vars/single-controller.tmpl | 32 ---------------------- 1 file changed, 32 deletions(-) (limited to 'deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/single-controller.tmpl') 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 -- cgit 1.2.3-korg