Skip to content

Commit bb09caf

Browse files
ernjvryadvr
authored andcommitted
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
1 parent 2756d41 commit bb09caf

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

packaging/centos63/cloud.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,10 @@ if [ -f "%{_sysconfdir}/cloud.rpmsave/management/db.properties" ]; then
454454
mv %{_sysconfdir}/cloud.rpmsave/management/db.properties %{_sysconfdir}/cloud.rpmsave/management/db.properties.rpmsave
455455
fi
456456

457+
if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
458+
rm -f %{_sysconfdir}/sysconfig/%{name}-management
459+
fi
460+
457461
chown -R cloud:cloud /var/log/cloudstack/management
458462

459463
%preun agent

packaging/centos7/cloud.spec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,11 +398,13 @@ if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util
398398
fi
399399

400400
if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
401-
mv %{_sysconfdir}/sysconfig/%{name}-management %{_sysconfdir}/default/%{name}-management
401+
rm -f %{_sysconfdir}/sysconfig/%{name}-management
402402
fi
403403

404404
chown -R cloud:cloud /var/log/cloudstack/management
405405

406+
systemctl daemon-reload
407+
406408
%preun agent
407409
/sbin/service cloudstack-agent stop || true
408410
if [ "$1" == "0" ] ; then

0 commit comments

Comments
 (0)