diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-12-21 09:15:21 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-12-21 14:38:08 +0100 |
| commit | 87f70afb852099739d7fd52c9d90a862446c0e23 (patch) | |
| tree | 98cb1c60f768c9a1232151a79398a3d75cdc3725 /base/server/python/pki/server | |
| parent | a21bb992a36737d23b6994bac76cc727b6cb4454 (diff) | |
| download | pki-87f70afb852099739d7fd52c9d90a862446c0e23.tar.gz pki-87f70afb852099739d7fd52c9d90a862446c0e23.tar.xz pki-87f70afb852099739d7fd52c9d90a862446c0e23.zip | |
Refactored pki_subsystem object in pkiconfig.py.
To improve reusability the pki_subsystem object has been converted
from a global variable in pkiconfig.py into an attribute in
PKIDeployer.
Diffstat (limited to 'base/server/python/pki/server')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiconfig.py | 2 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/pkihelper.py | 3 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/base/server/python/pki/server/deployment/pkiconfig.py b/base/server/python/pki/server/deployment/pkiconfig.py index 675926df5..5557562ce 100644 --- a/base/server/python/pki/server/deployment/pkiconfig.py +++ b/base/server/python/pki/server/deployment/pkiconfig.py @@ -105,8 +105,6 @@ pki_certificate_timestamp = None # PKI Deployment Command-Line Variables pki_deployment_executable = None -# PKI Deployment "Mandatory" Command-Line Variables -pki_subsystem = None # 'pkispawn' ONLY default_deployment_cfg = None user_deployment_cfg = None diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 7dbe31171..75d0fb20b 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -4585,6 +4585,9 @@ class PKIDeployer: """Holds the global dictionaries and the utility objects""" def __init__(self): + # PKI Deployment "Mandatory" Command-Line Variables + self.subsystem_name = None + # Global dictionary variables self.mdict = {} self.slots = {} diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index af4f0d898..6ea2867ba 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -209,8 +209,8 @@ class PKIConfigParser: 'pki_http_port': default_http_port, 'pki_https_port': default_https_port, 'pki_dns_domainname': config.pki_dns_domainname, - 'pki_subsystem': config.pki_subsystem, - 'pki_subsystem_type': config.pki_subsystem.lower(), + 'pki_subsystem': self.deployer.subsystem_name, + 'pki_subsystem_type': self.deployer.subsystem_name.lower(), 'pki_root_prefix': config.pki_root_prefix, 'java_home': java_home, 'resteasy_lib': resteasy_lib, @@ -415,8 +415,8 @@ class PKIConfigParser: web_server_dict[0] = None self.mdict.update(web_server_dict) - if self.deployer.main_config.has_section(config.pki_subsystem): - subsystem_dict = dict(self.deployer.main_config.items(config.pki_subsystem)) + if self.deployer.main_config.has_section(self.deployer.subsystem_name): + subsystem_dict = dict(self.deployer.main_config.items(self.deployer.subsystem_name)) subsystem_dict[0] = None self.mdict.update(subsystem_dict) @@ -1258,7 +1258,7 @@ class PKIConfigParser: # Stand-alone PKI self.mdict['pki_security_domain_type'] = "new" self.mdict['pki_issuing_ca'] = "External CA" - elif (config.pki_subsystem != "CA" or + elif (self.deployer.subsystem_name != "CA" or config.str2bool(self.mdict['pki_clone']) or config.str2bool(self.mdict['pki_subordinate'])): # PKI KRA, PKI OCSP, PKI TKS, PKI TPS, |