diff --git a/rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py index a67136994..dfa7b7068 100644 --- a/rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py +++ b/rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py @@ -200,6 +200,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'Controller-1::CeilometerPassword': 'password', 'Compute-1::AdminPassword': 'password', 'Controller-1::HeatPassword': 'password', + 'Controller-1::HeatStackDomainAdminPassword': 'password', 'Controller-1::CeilometerMeteringSecret': 'password', 'Controller-1::SwiftPassword': 'password', 'Controller-1::NeutronBridgeMappings': 'datacentre:br-test', @@ -307,6 +308,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'Controller-1::CeilometerPassword': 'password', 'Compute-1::AdminPassword': 'password', 'Controller-1::HeatPassword': 'password', + 'Controller-1::HeatStackDomainAdminPassword': 'password', 'Controller-1::CeilometerMeteringSecret': 'password', 'Controller-1::SwiftPassword': 'password', 'Controller-1::NeutronBridgeMappings': 'datacentre:br-test', diff --git a/rdomanager_oscplugin/v1/overcloud_deploy.py b/rdomanager_oscplugin/v1/overcloud_deploy.py index 70606b0ee..cf83f0675 100644 --- a/rdomanager_oscplugin/v1/overcloud_deploy.py +++ b/rdomanager_oscplugin/v1/overcloud_deploy.py @@ -52,6 +52,7 @@ PARAMETERS = { 'ExtraConfig': '{}', 'GlancePassword': None, 'HeatPassword': None, + 'HeatStackDomainAdminPassword': None, 'NeutronControlPlaneID': None, 'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400', 'NeutronPassword': None, @@ -112,6 +113,8 @@ class DeployOvercloud(command.Command): parameters['GlancePassword'] = passwords[ 'OVERCLOUD_GLANCE_PASSWORD'] parameters['HeatPassword'] = passwords['OVERCLOUD_HEAT_PASSWORD'] + parameters['HeatStackDomainAdminPassword'] = passwords[ + 'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD'] parameters['NeutronPassword'] = passwords[ 'OVERCLOUD_NEUTRON_PASSWORD'] parameters['NovaPassword'] = passwords['OVERCLOUD_NOVA_PASSWORD'] @@ -146,6 +149,8 @@ class DeployOvercloud(command.Command): passwords['OVERCLOUD_GLANCE_PASSWORD']) parameters['Controller-1::HeatPassword'] = ( passwords['OVERCLOUD_HEAT_PASSWORD']) + parameters['Controller-1::HeatStackDomainAdminPassword'] = ( + passwords['OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD']) parameters['Controller-1::NeutronPassword'] = ( passwords['OVERCLOUD_NEUTRON_PASSWORD']) parameters['Compute-1::NeutronPassword'] = (