Skip to content

Commit a098878

Browse files
ustcweizhouustcweizhou
committed
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
1 parent 175549f commit a098878

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

‎debian/cloudstack-agent.postinst‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,15 @@ case "$1" in
3434
fi
3535
done
3636
fi
37+
38+
# Running cloudstack-agent-upgrade to update bridge name for upgrade from CloudStack 4.0.x (and before) to CloudStack 4.1 (and later)
39+
/usr/bin/cloudstack-agent-upgrade
40+
if [ ! -d "/etc/libvirt/hooks" ] ; then
41+
mkdir /etc/libvirt/hooks
42+
fi
43+
cp -a /usr/share/cloudstack-agent/lib/libvirtqemuhook /etc/libvirt/hooks/qemu
44+
/etc/init.d/libvirt-bin restart
3745
;;
3846
esac
3947

40-
exit 0
48+
exit 0

‎debian/rules‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ install:
7171
install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
7272
install -D agent/target/transformed/cloud-setup-agent $(DESTDIR)/usr/bin/cloudstack-setup-agent
7373
install -D agent/target/transformed/cloud-ssh $(DESTDIR)/usr/bin/cloudstack-ssh
74+
install -D agent/target/transformed/cloudstack-agent-upgrade $(DESTDIR)/usr/bin/cloudstack-setup-agent
75+
install -D agent/target/transformed/libvirtqemuhook $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
7476
install -D agent/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
7577

7678
# cloudstack-management

‎packaging/centos63/cloud.spec‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,13 @@ fi
476476

477477
%post agent
478478
if [ "$1" == "1" ] ; then
479+
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)"
480+
%{_bindir}/%{name}-agent-upgrade
481+
if [ ! -d %{_sysconfdir}/libvirt/hooks ] ; then
482+
mkdir %{_sysconfdir}/libvirt/hooks
483+
fi
484+
cp -a ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook %{_sysconfdir}/libvirt/hooks/qemu
485+
/sbin/service libvirtd restart
479486
/sbin/chkconfig --add cloudstack-agent > /dev/null 2>&1 || true
480487
/sbin/chkconfig --level 345 cloudstack-agent on > /dev/null 2>&1 || true
481488
fi

0 commit comments

Comments
 (0)