openstack
/
python-tripleoclient
Code Issues Proposed changes

Generate a password for Redis and pass it as deployment parameter 

Change-Id: I1a8741b9e00775763911222cbe0af677b59e03a1
(cherry picked from commit f2d80f30d7)
This commit is contained in:
Giulio Fidente 2016-03-09 16:56:33 +01:00 committed by James Slagle
parent fab746ba75
commit 90b9be39f4
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/tests/test_utils.py
View File

@ -49,12 +49,13 @@ class TestPasswordsUtil(TestCase):
mock.call('OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_NEUTRON_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_NOVA_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_REDIS_PASSWORD=PASSWORD\n'),
mock.call('OVERCLOUD_SWIFT_HASH=PASSWORD\n'),
mock.call('OVERCLOUD_SWIFT_PASSWORD=PASSWORD\n'),
])
self.assertEqual(generate_password_mock.call_count, 14)
self.assertEqual(generate_password_mock.call_count, 15)
self.assertEqual(len(passwords), 14)
self.assertEqual(len(passwords), 15)
@mock.patch("os.path.isfile", return_value=True)
@mock.patch("passlib.utils.generate_password",
@ -73,6 +74,7 @@ class TestPasswordsUtil(TestCase):
'OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD=PASSWORD\n',
'OVERCLOUD_NEUTRON_PASSWORD=PASSWORD\n',
'OVERCLOUD_NOVA_PASSWORD=PASSWORD\n',
'OVERCLOUD_REDIS_PASSWORD=PASSWORD\n',
'OVERCLOUD_SWIFT_HASH=PASSWORD\n',
'OVERCLOUD_SWIFT_PASSWORD=PASSWORD\n',
]
@ -85,7 +87,7 @@ class TestPasswordsUtil(TestCase):
passwords = utils.generate_overcloud_passwords()
generate_password_mock.assert_not_called()
self.assertEqual(len(passwords), 14)
self.assertEqual(len(passwords), 15)
for name in utils._PASSWORD_NAMES:
self.assertEqual('PASSWORD', passwords[name])

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

@ -161,6 +161,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'NeutronPublicInterface': 'nic1',
'NovaPassword': 'password',
'NtpServer': '',
'RedisPassword': 'password',
'SnmpdReadonlyUserPassword': 'PASSWORD',
'SwiftHashSuffix': 'password',
'SwiftPassword': 'password',
@ -314,6 +315,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'NeutronTunnelTypes': 'gre',
'NovaPassword': 'password',
'NtpServer': '',
'RedisPassword': 'password',
'SnmpdReadonlyUserPassword': 'PASSWORD',
'SwiftHashSuffix': 'password',
'SwiftPassword': 'password',

1
tripleoclient/tests/v1/utils.py
View File

@ -27,6 +27,7 @@ def generate_overcloud_passwords_mock():
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
"OVERCLOUD_NEUTRON_PASSWORD",
"OVERCLOUD_NOVA_PASSWORD",
"OVERCLOUD_REDIS_PASSWORD",
"OVERCLOUD_SWIFT_HASH",
"OVERCLOUD_SWIFT_PASSWORD",
"NEUTRON_METADATA_PROXY_SHARED_SECRET"

1
tripleoclient/utils.py
View File

@ -45,6 +45,7 @@ _PASSWORD_NAMES = (
"OVERCLOUD_HEAT_STACK_DOMAIN_PASSWORD",
"OVERCLOUD_NEUTRON_PASSWORD",
"OVERCLOUD_NOVA_PASSWORD",
"OVERCLOUD_REDIS_PASSWORD",
"OVERCLOUD_SWIFT_HASH",
"OVERCLOUD_SWIFT_PASSWORD",
"NEUTRON_METADATA_PROXY_SHARED_SECRET",

1
tripleoclient/v1/overcloud_deploy.py
View File

@ -76,6 +76,7 @@ class DeployOvercloud(command.Command):
parameters['NeutronPassword'] = passwords[
'OVERCLOUD_NEUTRON_PASSWORD']
parameters['NovaPassword'] = passwords['OVERCLOUD_NOVA_PASSWORD']
parameters['RedisPassword'] = passwords['OVERCLOUD_REDIS_PASSWORD']
parameters['SwiftHashSuffix'] = passwords['OVERCLOUD_SWIFT_HASH']
parameters['SwiftPassword'] = passwords['OVERCLOUD_SWIFT_PASSWORD']
parameters['SnmpdReadonlyUserPassword'] = (