From 842cb5f2670a0c84b1dd818ad4ed9017eb4bb14f Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Mon, 10 Sep 2018 15:54:46 +0200 Subject: Rename CustodiaModes.STANDALONE to CustodiaModes.FIRST_MASTER This is related to the DL0 code removal. FIRST_MASTER describes this mode a lot better. See: https://pagure.io/freeipa/issue/7689 Signed-off-by: Thomas Woerner Reviewed-By: Alexander Bokovoy --- ipaserver/install/custodiainstance.py | 8 ++++---- ipaserver/install/server/install.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ipaserver/install/custodiainstance.py b/ipaserver/install/custodiainstance.py index bc789fa94..907d3edd1 100644 --- a/ipaserver/install/custodiainstance.py +++ b/ipaserver/install/custodiainstance.py @@ -33,8 +33,8 @@ class CustodiaModes(enum.Enum): KRA_PEER = 'Custodia KRA peer' # any master will do MASTER_PEER = 'Custodia master peer' - # standalone / local instance - STANDALONE = 'Custodia standalone' + # local instance (first master) + FIRST_MASTER = 'Custodia on first master' def get_custodia_instance(config, mode): @@ -64,7 +64,7 @@ def get_custodia_instance(config, mode): assert isinstance(mode, CustodiaModes) logger.debug( "Custodia client for '%r' with promotion %s.", - mode, 'yes' if mode != CustodiaModes.STANDALONE else 'no' + mode, 'yes' if mode != CustodiaModes.FIRST_MASTER else 'no' ) if mode == CustodiaModes.CA_PEER: # In case we install replica with CA, prefer CA host as source for @@ -74,7 +74,7 @@ def get_custodia_instance(config, mode): custodia_peer = config.kra_host_name elif mode == CustodiaModes.MASTER_PEER: custodia_peer = config.master_host_name - elif mode == CustodiaModes.STANDALONE: + elif mode == CustodiaModes.FIRST_MASTER: custodia_peer = None else: raise RuntimeError("Unknown custodia mode %s", mode) diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index eac676b6a..4b88e9a40 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -823,7 +823,7 @@ def install(installer): subject_base=options.subject_base) custodia = custodiainstance.get_custodia_instance( - options, custodiainstance.CustodiaModes.MASTER_PEER) + options, custodiainstance.CustodiaModes.FIRST_MASTER) custodia.create_instance() if setup_ca: -- cgit