diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2012-10-29 22:08:00 -0700 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-10-30 10:56:06 -0400 |
| commit | a957a3d2960d6ae39a7785cccb0656d5ac230701 (patch) | |
| tree | ccf5f8acd7af2320cafca4d620ace4cf7d4b1cfa /base/deploy/src/scriptlets/selinux_setup.py | |
| parent | 1485a05654211eec7935441b468769298782df6e (diff) | |
| download | pki-a957a3d2960d6ae39a7785cccb0656d5ac230701.tar.gz pki-a957a3d2960d6ae39a7785cccb0656d5ac230701.tar.xz pki-a957a3d2960d6ae39a7785cccb0656d5ac230701.zip | |
Allow a PKI instance to be installed/configured independently
* TRAC Ticket #286 - Dogtag 10: Create parameter for optionally allowing
a user to skip configuration . . .
Diffstat (limited to 'base/deploy/src/scriptlets/selinux_setup.py')
| -rw-r--r-- | base/deploy/src/scriptlets/selinux_setup.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/base/deploy/src/scriptlets/selinux_setup.py b/base/deploy/src/scriptlets/selinux_setup.py index 0292081be..98bfcd48e 100644 --- a/base/deploy/src/scriptlets/selinux_setup.py +++ b/base/deploy/src/scriptlets/selinux_setup.py @@ -40,7 +40,11 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): selinux.restorecon(master['pki_instance_configuration_path'], True) def spawn(self): - config.pki_log.info(log.SUBSYSTEM_SPAWN_1, __name__, + if config.str2bool(master['pki_skip_installation']): + config.pki_log.info(log.SKIP_SELINUX_SPAWN_1, __name__, + extra=config.PKI_INDENTATION_LEVEL_1) + return self.rv + config.pki_log.info(log.SELINUX_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) # check first if any transactions are required @@ -98,13 +102,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): return self.rv def respawn(self): - config.pki_log.info(log.SUBSYSTEM_RESPAWN_1, __name__, + config.pki_log.info(log.SELINUX_RESPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) self.restore_context() return self.rv def destroy(self): - config.pki_log.info(log.SUBSYSTEM_DESTROY_1, __name__, + config.pki_log.info(log.SELINUX_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) # check first if any transactions are required |