openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Add gnocchi password as a deployment param"

Browse Source
This commit is contained in:
Jenkins
2016-03-29 21:25:09 +00:00
committed by Gerrit Code Review
parent f7ef875df4 d08f225d20
commit bdbe149924
5 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tripleoclient/constants.py
View File

@@ -21,6 +21,7 @@ SERVICE_LIST = {
'cinder': {'password_field': 'OVERCLOUD_CINDER_PASSWORD'},
'cinderv2': {'password_field': 'OVERCLOUD_CINDER_PASSWORD'},
'glance': {'password_field': 'OVERCLOUD_GLANCE_PASSWORD'},
'gnocchi': {'password_field': 'OVERCLOUD_GNOCCHI_PASSWORD'},
'heat': {'password_field': 'OVERCLOUD_HEAT_PASSWORD'},
'neutron': {'password_field': 'OVERCLOUD_NEUTRON_PASSWORD'},
'nova': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},

2
tripleoclient/tests/test_utils.py
View File

@@ -48,6 +48,7 @@ class TestPasswordsUtil(TestCase):
mock.call('OVERCLOUD_CINDER_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_DEMO_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_GNOCCHI_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_HAPROXY_STATS_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_HEAT_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n'),
@@ -85,6 +86,7 @@ class TestPasswordsUtil(TestCase):
'OVERCLOUD_CINDER_PASSWORD=PASSWORD\n',
'OVERCLOUD_DEMO_PASSWORD=PASSWORD\n',
'OVERCLOUD_GLANCE_PASSWORD=PASSWORD\n',
'OVERCLOUD_GNOCCHI_PASSWORD=PASSWORD\n',
'OVERCLOUD_HAPROXY_STATS_PASSWORD=PASSWORD\n',
'OVERCLOUD_HEAT_PASSWORD=PASSWORD\n',
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n',

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

@@ -151,6 +151,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'CinderPassword': 'password',
'ExtraConfig': '{}',
'GlancePassword': 'password',
'GnocchiPassword': 'password',
'HAProxyStatsPassword': 'password',
'HeatPassword': 'password',
'HeatStackDomainAdminPassword': 'password',
@@ -310,6 +311,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'CinderPassword': 'password',
'ExtraConfig': '{}',
'GlancePassword': 'password',
'GnocchiPassword': 'password',
'HAProxyStatsPassword': 'password',
'HeatPassword': 'password',
'HeatStackDomainAdminPassword': 'password',

1
tripleoclient/utils.py
View File

@@ -45,6 +45,7 @@ _PASSWORD_NAMES = (
"OVERCLOUD_CINDER_PASSWORD",
"OVERCLOUD_DEMO_PASSWORD",
"OVERCLOUD_GLANCE_PASSWORD",
"OVERCLOUD_GNOCCHI_PASSWORD",
"OVERCLOUD_HAPROXY_STATS_PASSWORD",
"OVERCLOUD_HEAT_PASSWORD",
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",

1
tripleoclient/v1/overcloud_deploy.py
View File

@@ -75,6 +75,7 @@ class DeployOvercloud(command.Command):
'OVERCLOUD_CINDER_PASSWORD']
parameters['GlancePassword'] = passwords[
'OVERCLOUD_GLANCE_PASSWORD']
parameters['GnocchiPassword'] = passwords['OVERCLOUD_GNOCCHI_PASSWORD']
parameters['HAProxyStatsPassword'] = passwords[
'OVERCLOUD_HAPROXY_STATS_PASSWORD']
parameters['HeatPassword'] = passwords['OVERCLOUD_HEAT_PASSWORD']