openstack/python-tripleoclient
Code Issues Proposed changes

Generate CephX keys and FSID regardless of CephStorageCount

Browse Source 
This will change the client behavior so that it always generate
the CephX keys and the cluster FSID regardless of which value is
given as CephStorageCount, to cope with hyperconverged scenarios.

Change-Id: I64acd6a4ed1b56fddfd366b5846dba3c22300df4
Related-Bug: 1601864
(cherry picked from commit 694d097c5f)
This commit is contained in:
Giulio Fidente 2016-07-18 19:23:47 +02:00
parent bab489117e
commit 9cc645c479
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tripleoclient/v1/overcloud_deploy.py
View File

@ -194,15 +194,13 @@ class DeployOvercloud(command.Command):
'NeutronDhcpAgentsPerNetwork': dhcp_agents_per_network,
})
if int(parameters.get('CephStorageCount', 0)) > 0:
if stack_is_new:
parameters.update({
'CephClusterFSID': six.text_type(uuid.uuid1()),
'CephMonKey': utils.create_cephx_key(),
'CephAdminKey': utils.create_cephx_key(),
'CephClientKey': utils.create_cephx_key()
})
if stack_is_new:
parameters.update({
'CephClusterFSID': six.text_type(uuid.uuid1()),
'CephMonKey': utils.create_cephx_key(),
'CephAdminKey': utils.create_cephx_key(),
'CephClientKey': utils.create_cephx_key()
})
return parameters