diff options
| author | Ade Lee <alee@redhat.com> | 2013-03-18 11:29:52 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2013-03-21 12:11:31 -0400 |
| commit | c9a081037aa5bf15cf6226f06ea54ea98deba5bc (patch) | |
| tree | ba095458c940b4db7923719ce6cf6e14a2c1da8e /base/deploy/src/scriptlets/instance_layout.py | |
| parent | 22d50cc526c7fd4224a4d5a0ae9ebf66afd8e83a (diff) | |
| download | pki-c9a081037aa5bf15cf6226f06ea54ea98deba5bc.tar.gz pki-c9a081037aa5bf15cf6226f06ea54ea98deba5bc.tar.xz pki-c9a081037aa5bf15cf6226f06ea54ea98deba5bc.zip | |
Refactor installation code to remove dependency on jython
Connection is now made to the installation servlet through a python
client using JSON. The code to construct the ConfgurationRequest and
parse the results has been moved to pkihelper.py, and configuration.py
no longer calls a separate jython process to create the Configuration
object and parse the results. The jython code has therefore been removed.
Also added status servlet to other java subsystems, to be tested prior
to starting configuration.
Trac Ticket 532
Diffstat (limited to 'base/deploy/src/scriptlets/instance_layout.py')
| -rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 773305c13..843227a84 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -170,7 +170,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.delete( master['pki_instance_type_registry_path']) elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS and\ - util.instance.tomcat_instance_subsystems() == 0: + len(util.instance.tomcat_instance_subsystems()) == 0: # remove Tomcat instance base util.directory.delete(master['pki_instance_path']) # remove Tomcat instance logs |