From 694d097c5fd3db8026b43ea577dc0548fcd6ca4e Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 18 Jul 2016 19:23:47 +0200 Subject: [PATCH] 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 --- tripleoclient/v1/overcloud_deploy.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 4e6810b54..c042e5fd1 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/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