x
/
deb-os-cloud-config
Code Issues Proposed changes

Switch keystone certs to parameter_defaults 

All other client parameters are now passed via parameter_defaults,
which will be required to enable moving parameters within t-h-t to
accommodate split-stack and composable roles.

Change-Id: I9d8daea560661cde5502e053f8d417957ee3e2c6
This commit is contained in:
Steven Hardy 2016-01-28 16:45:55 +00:00
parent 9318fcf022
commit fa775a5eb9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/usage.rst
View File

@ -104,7 +104,7 @@ which Keystone uses for signing authentication tokens.
That adds following values into ``overcloud-env.json`` file::
{
"parameters": {
"parameter_defaults": {
"KeystoneSigningKey": "some_key",
"KeystoneSigningCertificate": "some_cert",
"KeystoneCACertificate": "some_cert"

2
os_cloud_config/keystone_pki.py
View File

@ -162,7 +162,7 @@ def generate_certs_into_json(jsonfile, seed):
signing_key_name = 'signing_key'
signing_cert_name = 'signing_certificate'
else:
parent = 'parameters'
parent = 'parameter_defaults'
ca_cert_name = 'KeystoneCACertificate'
signing_key_name = 'KeystoneSigningKey'
signing_cert_name = 'KeystoneSigningCertificate'

4
os_cloud_config/tests/test_keystone_pki.py
View File

@ -112,7 +112,7 @@ class KeystonePKITest(base.TestCase):
keystone_pki.generate_certs_into_json('/jsonfile', False)
params = mock_json.call_args[0][0]['parameters']
params = mock_json.call_args[0][0]['parameter_defaults']
self.assertEqual(params['KeystoneCACertificate'], 'mock_ca_cert')
self.assertEqual(params['KeystoneSigningKey'], 'mock_signing_key')
self.assertEqual(params['KeystoneSigningCertificate'],
@ -131,7 +131,7 @@ class KeystonePKITest(base.TestCase):
create_signing.return_value = ('mock_signing_key', 'mock_signing_cert')
isfile.return_value = True
mock_json_load.return_value = {
'parameters': {
'parameter_defaults': {
'KeystoneCACertificate': 'mock_ca_cert',
'KeystoneSigningKey': 'mock_signing_key',
'KeystoneSigningCertificate': 'mock_signing_cert'