x/compass-core
Code Issues Proposed changes

update config file of password

Browse Source 
update config file of password

Change-Id: I114fa23a79421c524049ef82ffe6055fc32d9bb2
Signed-off-by: baigk <baiguoku@huawei.com>
This commit is contained in:
baigk 2015-12-30 16:09:22 +08:00
parent e7fda435ed
commit 2fd269037e
7 changed files with 63 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf/flavor_mapping/HA-ansible-multinodes-juno.conf
View File

@ -27,6 +27,10 @@ CONFIG_MAPPING = {
"username": "keystone", "username": "keystone",
"password": "keystone" "password": "keystone"
}, },
"network": {
"username": "network",
"password": "network"
},
"image": { "image": {
"username": "glance", "username": "glance",
"password": "glance" "password": "glance"
@ -62,6 +66,10 @@ CONFIG_MAPPING = {
"username": "admin", "username": "admin",
"password": "admin" "password": "admin"
}, },
"demo": {
"username": "demo",
"password": "demo"
},
"compute": { "compute": {
"username": "nova", "username": "nova",
"password": "nova" "password": "nova"
@ -70,6 +78,10 @@ CONFIG_MAPPING = {
"username": "dashboard", "username": "dashboard",
"password": "dashboard" "password": "dashboard"
}, },
"identity": {
"username": "keystone",
"password": "keystone"
},
"image": { "image": {
"username": "glance", "username": "glance",
"password": "glance" "password": "glance"

12
conf/flavor_mapping/HA-ansible-multinodes-kilo.conf
View File

@ -31,6 +31,10 @@ CONFIG_MAPPING = {
"username": "glance", "username": "glance",
"password": "glance" "password": "glance"
}, },
"network": {
"username": "neutron",
"password": "neutron"
},
"metering": { "metering": {
"username": "ceilometer", "username": "ceilometer",
"password": "ceilometer" "password": "ceilometer"
@ -58,6 +62,10 @@ CONFIG_MAPPING = {
"username": "admin", "username": "admin",
"password": "admin" "password": "admin"
}, },
"demo": {
"username": "demo",
"password": "demo"
},
"compute": { "compute": {
"username": "nova", "username": "nova",
"password": "nova" "password": "nova"
@ -66,6 +74,10 @@ CONFIG_MAPPING = {
"username": "dashboard", "username": "dashboard",
"password": "dashboard" "password": "dashboard"
}, },
"identity": {
"username": "keystone",
"password": "keystone"
},
"image": { "image": {
"username": "glance", "username": "glance",
"password": "glance" "password": "glance"

12
conf/flavor_mapping/HA-ansible-multinodes-liberty.conf
View File

@ -35,6 +35,10 @@ CONFIG_MAPPING = {
"username": "ceilometer", "username": "ceilometer",
"password": "ceilometer" "password": "ceilometer"
}, },
"network": {
"username": "neutron",
"password": "neutron"
},
"mysql": { "mysql": {
"username": "root", "username": "root",
"password": "root" "password": "root"
@ -62,6 +66,10 @@ CONFIG_MAPPING = {
"username": "admin", "username": "admin",
"password": "admin" "password": "admin"
}, },
"demo": {
"username": "demo",
"password": "demo"
},
"compute": { "compute": {
"username": "nova", "username": "nova",
"password": "nova" "password": "nova"
@ -70,6 +78,10 @@ CONFIG_MAPPING = {
"username": "dashboard", "username": "dashboard",
"password": "dashboard" "password": "dashboard"
}, },
"identity": {
"username": "keystone",
"password": "keystone"
},
"image": { "image": {
"username": "glance", "username": "glance",
"password": "glance" "password": "glance"

4
conf/package_metadata/openstack.conf
View File

@ -8,7 +8,7 @@ METADATA = {
'_self': { '_self': {
'required_in_whole_config': True, 'required_in_whole_config': True,
'key_extensions': { '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' 'mapping_to': 'service_credentials'
}, },
@ -37,7 +37,7 @@ METADATA = {
'_self': { '_self': {
'required_in_whole_config': True, 'required_in_whole_config': True,
'key_extensions': { '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' 'mapping_to': 'console_credentials'
}, },

20
conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl
View File

@ -95,9 +95,8 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
#set console_credentials = $getVar('console_credentials', {}) #set console_credentials = $getVar('console_credentials', {})
#set rabbit_username = $credentials.rabbitmq.username #set rabbit_username = $credentials.rabbitmq.username
#set rabbit_password = $credentials.rabbitmq.password #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_dbpass = $credentials.identity.password
#set keystone_pass = $console_credentials.identity.password
#set glance_dbpass = $credentials.image.password #set glance_dbpass = $credentials.image.password
#set glance_pass = $console_credentials.image.password #set glance_pass = $console_credentials.image.password
#set nova_dbpass = $credentials.compute.password #set nova_dbpass = $credentials.compute.password
@ -107,8 +106,12 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
#set cinder_pass = $console_credentials.volume.password #set cinder_pass = $console_credentials.volume.password
#set heat_dbpass = $credentials.heat.password #set heat_dbpass = $credentials.heat.password
#set heat_pass = $console_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 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 cluster_name: $cluster_name
@ -129,10 +132,9 @@ erlang.cookie: DJJVECFMCJPVYQTJTDWG
RABBIT_USER: $rabbit_username RABBIT_USER: $rabbit_username
RABBIT_PASS: $rabbit_password RABBIT_PASS: $rabbit_password
KEYSTONE_DBPASS: $keystone_dbpass KEYSTONE_DBPASS: $keystone_dbpass
CEILOMETER_DBPASS: service KEYSTONE_PASS: $keystone_pass
CEILOMETER_PASS: console CEILOMETER_DBPASS: $ceilometer_dbpass
DEMO_PASS: demo_secret CEILOMETER_PASS: $ceilometer_pass
ADMIN_PASS: $admin_pass
GLANCE_DBPASS: $glance_dbpass GLANCE_DBPASS: $glance_dbpass
GLANCE_PASS: $glance_pass GLANCE_PASS: $glance_pass
NOVA_DBPASS: $nova_dbpass NOVA_DBPASS: $nova_dbpass
@ -140,10 +142,12 @@ NOVA_PASS: $nova_pass
DASH_DBPASS: $dash_dbpass DASH_DBPASS: $dash_dbpass
CINDER_DBPASS: $cinder_dbpass CINDER_DBPASS: $cinder_dbpass
CINDER_PASS: $cinder_pass CINDER_PASS: $cinder_pass
NEUTRON_DBPASS: $neutron_pass NEUTRON_DBPASS: $neutron_dbpass
NEUTRON_PASS: $neutron_pass NEUTRON_PASS: $neutron_pass
HEAT_DBPASS: $heat_dbpass HEAT_DBPASS: $heat_dbpass
HEAT_PASS: $heat_pass HEAT_PASS: $heat_pass
DEMO_PASS: $demo_pass
ADMIN_PASS: $admin_pass
#set neutron_service_plugins=['router'] #set neutron_service_plugins=['router']

20
conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl
View File

@ -95,9 +95,8 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
#set console_credentials = $getVar('console_credentials', {}) #set console_credentials = $getVar('console_credentials', {})
#set rabbit_username = $credentials.rabbitmq.username #set rabbit_username = $credentials.rabbitmq.username
#set rabbit_password = $credentials.rabbitmq.password #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_dbpass = $credentials.identity.password
#set keystone_pass = $console_credentials.identity.password
#set glance_dbpass = $credentials.image.password #set glance_dbpass = $credentials.image.password
#set glance_pass = $console_credentials.image.password #set glance_pass = $console_credentials.image.password
#set nova_dbpass = $credentials.compute.password #set nova_dbpass = $credentials.compute.password
@ -107,8 +106,12 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
#set cinder_pass = $console_credentials.volume.password #set cinder_pass = $console_credentials.volume.password
#set heat_dbpass = $credentials.heat.password #set heat_dbpass = $credentials.heat.password
#set heat_pass = $console_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 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 cluster_name: $cluster_name
@ -129,10 +132,9 @@ erlang.cookie: DJJVECFMCJPVYQTJTDWG
RABBIT_USER: $rabbit_username RABBIT_USER: $rabbit_username
RABBIT_PASS: $rabbit_password RABBIT_PASS: $rabbit_password
KEYSTONE_DBPASS: $keystone_dbpass KEYSTONE_DBPASS: $keystone_dbpass
CEILOMETER_DBPASS: service KEYSTONE_PASS: $keystone_pass
CEILOMETER_PASS: console CEILOMETER_DBPASS: $ceilometer_dbpass
DEMO_PASS: demo_secret CEILOMETER_PASS: $ceilometer_pass
ADMIN_PASS: $admin_pass
GLANCE_DBPASS: $glance_dbpass GLANCE_DBPASS: $glance_dbpass
GLANCE_PASS: $glance_pass GLANCE_PASS: $glance_pass
NOVA_DBPASS: $nova_dbpass NOVA_DBPASS: $nova_dbpass
@ -140,10 +142,12 @@ NOVA_PASS: $nova_pass
DASH_DBPASS: $dash_dbpass DASH_DBPASS: $dash_dbpass
CINDER_DBPASS: $cinder_dbpass CINDER_DBPASS: $cinder_dbpass
CINDER_PASS: $cinder_pass CINDER_PASS: $cinder_pass
NEUTRON_DBPASS: $neutron_pass NEUTRON_DBPASS: $neutron_dbpass
NEUTRON_PASS: $neutron_pass NEUTRON_PASS: $neutron_pass
HEAT_DBPASS: $heat_dbpass HEAT_DBPASS: $heat_dbpass
HEAT_PASS: $heat_pass HEAT_PASS: $heat_pass
DEMO_PASS: $demo_pass
ADMIN_PASS: $admin_pass
#set neutron_service_plugins=['router'] #set neutron_service_plugins=['router']

1
conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl
View File

@ -132,6 +132,7 @@ erlang.cookie: DJJVECFMCJPVYQTJTDWG
RABBIT_USER: $rabbit_username RABBIT_USER: $rabbit_username
RABBIT_PASS: $rabbit_password RABBIT_PASS: $rabbit_password
KEYSTONE_DBPASS: $keystone_dbpass KEYSTONE_DBPASS: $keystone_dbpass
KEYSTONE_PASS: $keystone_pass
CEILOMETER_DBPASS: $ceilometer_dbpass CEILOMETER_DBPASS: $ceilometer_dbpass
CEILOMETER_PASS: $ceilometer_pass CEILOMETER_PASS: $ceilometer_pass
GLANCE_DBPASS: $glance_dbpass GLANCE_DBPASS: $glance_dbpass