Generate CephX keys and FSID regardless of CephStorageCount

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
changes/94/343794/3
Giulio Fidente 6 years ago
parent d6196e9a4a
commit 694d097c5f
  1. 18
      tripleoclient/v1/overcloud_deploy.py

@ -200,16 +200,14 @@ 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(),
'CephRgwKey': 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(),
'CephRgwKey': utils.create_cephx_key()
})
return parameters

Loading…
Cancel
Save