IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename CustodiaModes.STANDALONE to CustodiaModes.FIRST_MASTER

Browse Source 
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 <twoerner@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Thomas Woerner 2018-09-10 15:54:46 +02:00
parent 15bf647e48
commit 842cb5f267
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/install/custodiainstance.py
View File

@ -33,8 +33,8 @@ class CustodiaModes(enum.Enum):
KRA_PEER = 'Custodia KRA peer' KRA_PEER = 'Custodia KRA peer'
# any master will do # any master will do
MASTER_PEER = 'Custodia master peer' MASTER_PEER = 'Custodia master peer'
# standalone / local instance # local instance (first master)
STANDALONE = 'Custodia standalone' FIRST_MASTER = 'Custodia on first master'
def get_custodia_instance(config, mode): def get_custodia_instance(config, mode):
@ -64,7 +64,7 @@ def get_custodia_instance(config, mode):
assert isinstance(mode, CustodiaModes) assert isinstance(mode, CustodiaModes)
logger.debug( logger.debug(
"Custodia client for '%r' with promotion %s.", "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: if mode == CustodiaModes.CA_PEER:
# In case we install replica with CA, prefer CA host as source for # 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 custodia_peer = config.kra_host_name
elif mode == CustodiaModes.MASTER_PEER: elif mode == CustodiaModes.MASTER_PEER:
custodia_peer = config.master_host_name custodia_peer = config.master_host_name
elif mode == CustodiaModes.STANDALONE: elif mode == CustodiaModes.FIRST_MASTER:
custodia_peer = None custodia_peer = None
else: else:
raise RuntimeError("Unknown custodia mode %s", mode) raise RuntimeError("Unknown custodia mode %s", mode)

2
ipaserver/install/server/install.py
View File

@ -823,7 +823,7 @@ def install(installer):
subject_base=options.subject_base) subject_base=options.subject_base)
custodia = custodiainstance.get_custodia_instance( custodia = custodiainstance.get_custodia_instance(
options, custodiainstance.CustodiaModes.MASTER_PEER) options, custodiainstance.CustodiaModes.FIRST_MASTER)
custodia.create_instance() custodia.create_instance()
if setup_ca: if setup_ca: