diff options
| author | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-06-01 11:05:19 -0600 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-06-02 16:47:21 -0600 |
| commit | 1470f72574464e5d45926bce9b56c610ab84fec2 (patch) | |
| tree | 3b8dcef104dd9f78147d00f79432edb184bbd5bb /base/server/python | |
| parent | 36880e1fd2dd9efe0d0bc2e5aa856720e0a8bffc (diff) | |
| download | pki-1470f72574464e5d45926bce9b56c610ab84fec2.tar.gz pki-1470f72574464e5d45926bce9b56c610ab84fec2.tar.xz pki-1470f72574464e5d45926bce9b56c610ab84fec2.zip | |
Fix unknown TKS host and port connector error during TPS removal
- PKI TRAC #1677 - Pkidestroy of a TPS instance installed in a shared tomcat
throws error.
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkihelper.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 4fc8afdd5..50146af99 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -3183,8 +3183,9 @@ class TPSConnector: self.mdict['pki_target_cs_cfg']) tpshost = cs_cfg.get('service.machineName') tpsport = cs_cfg.get('pkicreate.secure_port') - tkshostport = cs_cfg.get('conn.tks1.hostport') - if tkshostport is None: + tkshost = cs_cfg.get('tps.connector.tks1.host') + tksport = cs_cfg.get('tps.connector.tks1.port') + if tkshost is None or tksport is None: config.pki_log.warning( log.PKIHELPER_TPSCONNECTOR_UPDATE_FAILURE, extra=config.PKI_INDENTATION_LEVEL_2) @@ -3196,14 +3197,6 @@ class TPSConnector: else: return - # retrieve tks host and port - if ':' in tkshostport: - tkshost = tkshostport.split(':')[0] - tksport = tkshostport.split(':')[1] - else: - tkshost = tkshostport - tksport = '443' - # retrieve subsystem nickname subsystemnick = cs_cfg.get('tps.cert.subsystem.nickname') if subsystemnick is None: |