summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/scriptlets/initialization.py
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2013-10-15 17:55:05 -0700
committerMatthew Harmsen <mharmsen@redhat.com>2013-10-15 17:59:23 -0700
commit47c77a67d67cb443070137fd9b8d64955d499089 (patch)
tree12b7588f34a80a74c000e77b19017ec941ad5231 /base/server/python/pki/server/deployment/scriptlets/initialization.py
parent618be8bd7e9488a325789232c94aad109f9b6803 (diff)
downloadpki-47c77a67d67cb443070137fd9b8d64955d499089.tar.gz
pki-47c77a67d67cb443070137fd9b8d64955d499089.tar.xz
pki-47c77a67d67cb443070137fd9b8d64955d499089.zip
Stand-alone DRM
* TRAC Ticket #667 - provide option for ca-less drm install
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/initialization.py')
-rw-r--r--base/server/python/pki/server/deployment/scriptlets/initialization.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/initialization.py b/base/server/python/pki/server/deployment/scriptlets/initialization.py
index ecfb4d195..d9d1d2d7b 100644
--- a/base/server/python/pki/server/deployment/scriptlets/initialization.py
+++ b/base/server/python/pki/server/deployment/scriptlets/initialization.py
@@ -43,10 +43,11 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
else:
config.pki_log.info(log.INITIALIZATION_SPAWN_1, __name__,
extra=config.PKI_INDENTATION_LEVEL_1)
- if deployer.master_dict['pki_subsystem'] == "CA" and\
+ if (deployer.master_dict['pki_subsystem'] == "CA" or
+ config.str2bool(deployer.master_dict['pki_standalone'])) and\
config.str2bool(deployer.master_dict['pki_external_step_two']):
- # verify that this type of "subsystem" currently EXISTS
- # for this "instance" (External CA Step 2)
+ # verify that this External CA (Step 2), or Stand-alone PKI
+ # (Step 2) currently EXISTS for this "instance"
deployer.instance.verify_subsystem_exists()
deployer.master_dict['pki_skip_installation'] = "True"
else: