CLOUDSTACK-4405: change rpm and debian packaging to support automatic update
(KVM upgrade)
Including following steps:
b. Run "cloudstack-agent-upgrade". This script will upgrade all the existing
bridge name to new bridge name, and update related firewall rules.
c. install a libvirt hook:
c1. mkdir /etc/libvirt/hooks
c2. cp /usr/share/cloudstack-agent/lib/libvirtqemuhook
/etc/libvirt/hooks/qemu
c3. chmod +x /etc/libvirt/hooks/qemu
c4. service libvirtd restart
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a0988780
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a0988780
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a0988780
Branch: refs/heads/4.2
Commit: a0988780ad88bb56becb0a13efedcd79c1bee142
Parents: 175549f
Author: Wei Zhou <w.z...@leaseweb.com>
Authored: Tue Sep 24 09:14:15 2013 +0200
Committer: Wei Zhou <w.z...@leaseweb.com>
Committed: Tue Sep 24 09:14:15 2013 +0200
----------------------------------------------------------------------
debian/cloudstack-agent.postinst | 10 +++++++++-
debian/rules | 2 ++
packaging/centos63/cloud.spec | 7 +++++++
3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0988780/debian/cloudstack-agent.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-agent.postinst b/debian/cloudstack-agent.postinst
index 499ae6a..9bad138 100644
--- a/debian/cloudstack-agent.postinst
+++ b/debian/cloudstack-agent.postinst
@@ -34,7 +34,15 @@ case "$1" in
fi
done
fi
+
+ # Running cloudstack-agent-upgrade to update bridge name for upgrade
from CloudStack 4.0.x (and before) to CloudStack 4.1 (and later)
+ /usr/bin/cloudstack-agent-upgrade
+ if [ ! -d "/etc/libvirt/hooks" ] ; then
+ mkdir /etc/libvirt/hooks
+ fi
+ cp -a /usr/share/cloudstack-agent/lib/libvirtqemuhook
/etc/libvirt/hooks/qemu
+ /etc/init.d/libvirt-bin restart
;;
esac
-exit 0
\ No newline at end of file
+exit 0
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0988780/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 5e3d58c..26a3495 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,6 +71,8 @@ install:
install -D packaging/debian/init/cloud-agent
$(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
install -D agent/target/transformed/cloud-setup-agent
$(DESTDIR)/usr/bin/cloudstack-setup-agent
install -D agent/target/transformed/cloud-ssh
$(DESTDIR)/usr/bin/cloudstack-ssh
+ install -D agent/target/transformed/cloudstack-agent-upgrade
$(DESTDIR)/usr/bin/cloudstack-setup-agent
+ install -D agent/target/transformed/libvirtqemuhook
$(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
install -D agent/target/transformed/*
$(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
# cloudstack-management
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0988780/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 5f8a2a5..1e88ea7 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -476,6 +476,13 @@ fi
%post agent
if [ "$1" == "1" ] ; then
+ echo "Running %{_bindir}/%{name}-agent-upgrade to update bridge name for
upgrade from CloudStack 4.0.x (and before) to CloudStack 4.1 (and later)"
+ %{_bindir}/%{name}-agent-upgrade
+ if [ ! -d %{_sysconfdir}/libvirt/hooks ] ; then
+ mkdir %{_sysconfdir}/libvirt/hooks
+ fi
+ cp -a ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook
%{_sysconfdir}/libvirt/hooks/qemu
+ /sbin/service libvirtd restart
/sbin/chkconfig --add cloudstack-agent > /dev/null 2>&1 || true
/sbin/chkconfig --level 345 cloudstack-agent on > /dev/null 2>&1 || true
fi
