diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-05 15:59:44 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-09 15:25:43 -0500 |
commit | 8dc63c812dff4ba967ad46f343f47c2d2eae18fb (patch) | |
tree | e04489c424917b9a33b92a9b0849a7e17e5bd253 /base/deploy/src/scriptlets/instance_layout.py | |
parent | cdc4090aa9d1541ce69ad5fa399a13eb7604ec77 (diff) | |
download | pki-8dc63c812dff4ba967ad46f343f47c2d2eae18fb.tar.gz pki-8dc63c812dff4ba967ad46f343f47c2d2eae18fb.tar.xz pki-8dc63c812dff4ba967ad46f343f47c2d2eae18fb.zip |
Updated tools to deploy combined images and CSS files.
The pkispawn and pkicreate have been updated to deploy the
combined images and CSS files from the common-ui into /pki/images
and /pki/css.
The common Velocity templates and JavaScript files still need to
be deployed from the <subsystem>-ui packages into each subsystem.
Ticket #328
Diffstat (limited to 'base/deploy/src/scriptlets/instance_layout.py')
-rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 138 |
1 files changed, 10 insertions, 128 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index b4d1a5068..41327252a 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -72,22 +72,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.create(master['pki_tomcat_webapps_path']) util.directory.create(master['pki_tomcat_webapps_common_path']) - common_images = os.path.join( - master['pki_tomcat_webapps_common_path'], - "images") - - # Copy /usr/share/pki/common-ui/admin/console/img - # to <instance>/webapp/pki/images - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "admin", - "console", - "img"), - common_images, - overwrite_flag=True) - # Copy /usr/share/pki/common-ui/css # to <instance>/webapp/pki/css util.directory.copy( @@ -100,61 +84,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "css"), overwrite_flag=True) - # Copy /usr/share/pki/common-ui/img + # Copy /usr/share/pki/common-ui/images # to <instance>/webapp/pki/images util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "common-ui", - "img"), - common_images, + "images"), + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), overwrite_flag=True) - # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/admin/graphics - # to <instance>/webapp/pki/images - dir = os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - master['pki_subsystem'].lower() + "-ui", - "webapps", - master['pki_subsystem'].lower(), - "admin", - "graphics") - if (util.directory.exists(dir)): - util.directory.copy( - dir, - common_images, - overwrite_flag=True) - - # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/agent/graphics - # to <instance>/webapp/pki/images - dir = os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - master['pki_subsystem'].lower() + "-ui", - "webapps", - master['pki_subsystem'].lower(), - "agent", - "graphics") - if (util.directory.exists(dir)): - util.directory.copy( - dir, - common_images, - overwrite_flag=True) - - # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/ee/graphics - # to <instance>/webapp/pki/images - dir = os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - master['pki_subsystem'].lower() + "-ui", - "webapps", - master['pki_subsystem'].lower(), - "ee", - "graphics") - if (util.directory.exists(dir)): - util.directory.copy( - dir, - common_images, - overwrite_flag=True) - util.directory.create(master['pki_tomcat_webapps_root_path']) util.directory.copy( os.path.join( @@ -259,22 +200,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.modify(master['pki_instance_lib_log4j_properties']) util.directory.modify(master['pki_tomcat_webapps_path']) - common_images = os.path.join( - master['pki_tomcat_webapps_common_path'], - "images") - - # Copy /usr/share/pki/common-ui/admin/console/img - # to <instance>/webapp/pki/images - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "admin", - "console", - "img"), - common_images, - overwrite_flag=True) - # Copy /usr/share/pki/common-ui/css # to <instance>/webapp/pki/css util.directory.copy( @@ -287,61 +212,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "css"), overwrite_flag=True) - # Copy /usr/share/pki/common-ui/img + # Copy /usr/share/pki/common-ui/images # to <instance>/webapp/pki/images util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "common-ui", - "img"), - common_images, + "images"), + os.path.join( + master['pki_tomcat_webapps_common_path'], + "images"), overwrite_flag=True) - # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/admin/graphics - # to <instance>/webapp/pki/images - dir = os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - master['pki_subsystem'].lower() + "-ui", - "webapps", - master['pki_subsystem'].lower(), - "admin", - "graphics") - if (util.directory.exists(dir)): - util.directory.copy( - dir, - common_images, - overwrite_flag=True) - - # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/agent/graphics - # to <instance>/webapp/pki/images - dir = os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - master['pki_subsystem'].lower() + "-ui", - "webapps", - master['pki_subsystem'].lower(), - "agent", - "graphics") - if (util.directory.exists(dir)): - util.directory.copy( - dir, - common_images, - overwrite_flag=True) - - # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/ee/graphics - # to <instance>/webapp/pki/images - dir = os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - master['pki_subsystem'].lower() + "-ui", - "webapps", - master['pki_subsystem'].lower(), - "ee", - "graphics") - if (util.directory.exists(dir)): - util.directory.copy( - dir, - common_images, - overwrite_flag=True) - util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, |