openstack/python-tripleoclient
Code Issues Proposed changes

Pass HeatStackDomainAdminPassword through to heat

Browse Source 
This needs to be passed to avoid setting this password to "unset"

Change-Id: I06202d18e61e570ad3b8066f4c9c11d8fc7d94a4
This commit is contained in:
Derek Higgins
2015-06-26 13:13:24 +01:00
parent b234001407
commit 99a8c6c6d5
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@@ -200,6 +200,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'Controller-1::CeilometerPassword': 'password', 'Controller-1::CeilometerPassword': 'password',
'Compute-1::AdminPassword': 'password', 'Compute-1::AdminPassword': 'password',
'Controller-1::HeatPassword': 'password', 'Controller-1::HeatPassword': 'password',
'Controller-1::HeatStackDomainAdminPassword': 'password',
'Controller-1::CeilometerMeteringSecret': 'password', 'Controller-1::CeilometerMeteringSecret': 'password',
'Controller-1::SwiftPassword': 'password', 'Controller-1::SwiftPassword': 'password',
'Controller-1::NeutronBridgeMappings': 'datacentre:br-test', 'Controller-1::NeutronBridgeMappings': 'datacentre:br-test',
@@ -307,6 +308,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'Controller-1::CeilometerPassword': 'password', 'Controller-1::CeilometerPassword': 'password',
'Compute-1::AdminPassword': 'password', 'Compute-1::AdminPassword': 'password',
'Controller-1::HeatPassword': 'password', 'Controller-1::HeatPassword': 'password',
'Controller-1::HeatStackDomainAdminPassword': 'password',
'Controller-1::CeilometerMeteringSecret': 'password', 'Controller-1::CeilometerMeteringSecret': 'password',
'Controller-1::SwiftPassword': 'password', 'Controller-1::SwiftPassword': 'password',
'Controller-1::NeutronBridgeMappings': 'datacentre:br-test', 'Controller-1::NeutronBridgeMappings': 'datacentre:br-test',

5
rdomanager_oscplugin/v1/overcloud_deploy.py
View File

@@ -51,6 +51,7 @@ PARAMETERS = {
'ExtraConfig': '{}', 'ExtraConfig': '{}',
'GlancePassword': None, 'GlancePassword': None,
'HeatPassword': None, 'HeatPassword': None,
'HeatStackDomainAdminPassword': None,
'NeutronControlPlaneID': None, 'NeutronControlPlaneID': None,
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400', 'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
'NeutronPassword': None, 'NeutronPassword': None,
@@ -111,6 +112,8 @@ class DeployOvercloud(command.Command):
parameters['GlancePassword'] = passwords[ parameters['GlancePassword'] = passwords[
'OVERCLOUD_GLANCE_PASSWORD'] 'OVERCLOUD_GLANCE_PASSWORD']
parameters['HeatPassword'] = passwords['OVERCLOUD_HEAT_PASSWORD'] parameters['HeatPassword'] = passwords['OVERCLOUD_HEAT_PASSWORD']
parameters['HeatStackDomainAdminPassword'] = passwords[
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD']
parameters['NeutronPassword'] = passwords[ parameters['NeutronPassword'] = passwords[
'OVERCLOUD_NEUTRON_PASSWORD'] 'OVERCLOUD_NEUTRON_PASSWORD']
parameters['NovaPassword'] = passwords['OVERCLOUD_NOVA_PASSWORD'] parameters['NovaPassword'] = passwords['OVERCLOUD_NOVA_PASSWORD']
@@ -145,6 +148,8 @@ class DeployOvercloud(command.Command):
passwords['OVERCLOUD_GLANCE_PASSWORD']) passwords['OVERCLOUD_GLANCE_PASSWORD'])
parameters['Controller-1::HeatPassword'] = ( parameters['Controller-1::HeatPassword'] = (
passwords['OVERCLOUD_HEAT_PASSWORD']) passwords['OVERCLOUD_HEAT_PASSWORD'])
parameters['Controller-1::HeatStackDomainAdminPassword'] = (
passwords['OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD'])
parameters['Controller-1::NeutronPassword'] = ( parameters['Controller-1::NeutronPassword'] = (
passwords['OVERCLOUD_NEUTRON_PASSWORD']) passwords['OVERCLOUD_NEUTRON_PASSWORD'])
parameters['Compute-1::NeutronPassword'] = ( parameters['Compute-1::NeutronPassword'] = (