From 7ab6f6791b6ff08e548873155cba0410413096e7 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Wed, 2 Apr 2008 00:58:22 -0400 Subject: [PATCH] Change to using conserver instead of ssh svn path=/trunk/packages/sipb-xen-remctl-auto/; revision=386 --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/control.in | 2 +- files/usr/sbin/sipb-xen-vmcontrol | 11 ++++++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9979af9..a5f7e14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sipb-xen-remctl-auto (1.0.8) unstable; urgency=low + + * Add support for updating conserver when VMs are turned on and off + + -- Evan Broder Wed, 2 Apr 2008 00:40:23 -0400 + sipb-xen-remctl-auto (1.0.7) unstable; urgency=low * changes for installer system diff --git a/debian/control b/debian/control index 0df6d21..247a20d 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: sipb-xen-remctl-auto Section: net Priority: extra Maintainer: SIPB Xen Project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0) +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0) Standards-Version: 3.7.2 Package: sipb-xen-remctl-auto Architecture: all -Depends: ${misc:Depends}, remctl-server +Depends: ${misc:Depends}, remctl-server, sipb-xen-console-server Description: Installs the SIPB Xen automatic remctl management system This is our automatic remctl configuration management system. diff --git a/debian/control.in b/debian/control.in index 73dede5..2a90fd7 100644 --- a/debian/control.in +++ b/debian/control.in @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: sipb-xen-remctl-auto Architecture: all -Depends: ${misc:Depends}, remctl-server +Depends: ${misc:Depends}, remctl-server, sipb-xen-console-server Description: Installs the SIPB Xen automatic remctl management system This is our automatic remctl configuration management system. diff --git a/files/usr/sbin/sipb-xen-vmcontrol b/files/usr/sbin/sipb-xen-vmcontrol index 0c4d0e1..4d055bb 100755 --- a/files/usr/sbin/sipb-xen-vmcontrol +++ b/files/usr/sbin/sipb-xen-vmcontrol @@ -14,9 +14,14 @@ ACTION="$2" MACHINE="d_$ORIGMACHINE" case "$ACTION" in - list|vcpu-list|destroy|uptime|shutdown) + list|vcpu-list|uptime) xm "$ACTION" "$MACHINE" ;; + destroy|shutdown) + xm "$ACTION" "$MACHINE" + rm "/etc/conserver/conf.d/$MACHINE" + /usr/sbin/sipb-xen-update-conserver + ;; install|create|reboot) ARG="$3" shift; shift; shift; MOREARGS="$*" @@ -27,11 +32,15 @@ case "$ACTION" in fi if [ "$ACTION" = "install" ]; then xm create sipb-database machine_name="$ORIGMACHINE" installer="$ARG" installer_options="$MOREARGS" +# elif [ "$ACTION" = "copy" ]; then +# sipb-xen-duplicate ...etc... elif [ -n "$ARG" ]; then xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$ARG" else xm create sipb-database machine_name="$ORIGMACHINE" fi + echo "console $ORIGMACHINE {}" >"/etc/conserver/conf.d/$MACHINE" + /usr/sbin/sipb-xen-update-conserver ;; list-long) xm list --long "$MACHINE" -- 1.7.9.5