Merge pull request #1052 from davidamorimfaria/centos7-packaging CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libsCLOUDSTACK-9049: Fix Centos7 with Tomcat7 packaging and python libs
* pr/1052: CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libs * adjust library to support tomcat7 config files * adjust centos7 spec to use tomcat7 config files from deployment * add option to use tomcat7 files in management server setup reorder content to match original Signed-off-by: Remi Bergsma <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee639cff Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee639cff Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee639cff Branch: refs/heads/master Commit: ee639cffe4d3f352eab6cf6dd792fbb36edd8257 Parents: 5c48ce9 3c4a24c Author: Remi Bergsma <[email protected]> Authored: Tue Nov 10 13:30:55 2015 +0100 Committer: Remi Bergsma <[email protected]> Committed: Tue Nov 10 13:30:55 2015 +0100 ---------------------------------------------------------------------- client/bindir/cloud-setup-management.in | 3 + packaging/centos7/cloud.spec | 17 +-- packaging/centos7/tomcat7/db.properties | 136 +++++++++++----------- python/lib/cloudutils/globalEnv.py | 2 + python/lib/cloudutils/serviceConfigServer.py | 54 ++++++--- 5 files changed, 118 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee639cff/python/lib/cloudutils/serviceConfigServer.py ----------------------------------------------------------------------
