[cloudstack] branch 4.11 updated: packaging: remove deprecated tomcat based sysconfig file for centos (#2538)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.11 by this push:
     new bb09caf  packaging: remove deprecated tomcat based sysconfig file for centos (#2538)
bb09caf is described below

commit bb09caf8dcbee1a3ce9429cf60e3ab07c51f9da5
Author: ernjvr <er...@gmail.com>
AuthorDate: Mon Apr 9 21:01:09 2018 +0200

    packaging: remove deprecated tomcat based sysconfig file for centos (#2538)
    
    Remove deprecated tomcat configuration file instead of moving it, since moving it prevented the 4.11 upgrade from overwriting it with the new jetty configurations. Also added systemctl daemon-reload to refresh daemon services so that management server can start up seamlessly after the upgrade.
    
    Fixes #2537
---
 packaging/centos63/cloud.spec | 4 ++++
 packaging/centos7/cloud.spec  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 062e511..87d2c1e 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -454,6 +454,10 @@ if [ -f "%{_sysconfdir}/cloud.rpmsave/management/db.properties" ]; then
     mv %{_sysconfdir}/cloud.rpmsave/management/db.properties %{_sysconfdir}/cloud.rpmsave/management/db.properties.rpmsave
 fi
 
+if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
+    rm -f %{_sysconfdir}/sysconfig/%{name}-management
+fi
+
 chown -R cloud:cloud /var/log/cloudstack/management
 
 %preun agent
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 6ed3691..525421c 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -398,11 +398,13 @@ if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util
 fi
 
 if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
-    mv %{_sysconfdir}/sysconfig/%{name}-management  %{_sysconfdir}/default/%{name}-management
+    rm -f %{_sysconfdir}/sysconfig/%{name}-management
 fi
 
 chown -R cloud:cloud /var/log/cloudstack/management
 
+systemctl daemon-reload
+
 %preun agent
 /sbin/service cloudstack-agent stop || true
 if [ "$1" == "0" ] ; then

-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.