josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

woot! more reliable lxc teardown

Browse source
This commit is contained in:
Anthony Young 2011-09-13 03:02:38 -07:00
parent 99003e7511
commit eeba886408
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build_lxc.sh
View file

@ -12,9 +12,11 @@ WARMCACHE=${WARMCACHE:-0}
# Destroy any existing container # Destroy any existing container
lxc-stop -n $CONTAINER lxc-stop -n $CONTAINER
sleep 2 sleep 1
cgdelete -r cpu,net_cls:$CONTAINER
sleep 1
lxc-destroy -n $CONTAINER lxc-destroy -n $CONTAINER
sleep 2 sleep 1
CACHEDIR=/var/cache/lxc/natty/rootfs-amd64 CACHEDIR=/var/cache/lxc/natty/rootfs-amd64
if [ "$WARMCACHE" = "1" ]; then if [ "$WARMCACHE" = "1" ]; then
@ -68,6 +70,7 @@ EOF
INSTALL_SH=$ROOTFS/root/install.sh INSTALL_SH=$ROOTFS/root/install.sh
cat > $INSTALL_SH <<EOF cat > $INSTALL_SH <<EOF
#!/bin/bash #!/bin/bash
echo \#\!/bin/sh -e > /etc/rc.local
echo "nameserver $NAMESERVER" | resolvconf -a eth0 echo "nameserver $NAMESERVER" | resolvconf -a eth0
sleep 1 sleep 1
# Create a stack user that is a member of the libvirtd group so that stack # Create a stack user that is a member of the libvirtd group so that stack
@ -108,3 +111,12 @@ mount none -t cgroup /cgroup
# Start our container # Start our container
lxc-start -d -n $CONTAINER lxc-start -d -n $CONTAINER
cat << EOF > /bin/remove_dead_cgroup.shecho
"Removing dead cgroup .$CONTAINER." >> /var/log/cgroup
rmdir /cgroup/$CONTAINER >> /var/log/cgroup 2>&1
echo "return value was $?" >> /var/log/cgroup
EOF
chmod 755 /bin/remove_dead_cgroup.sh
echo /bin/remove_dead_cgroup.sh > /cgroup/release_agent
echo 1 > /cgroup/notify_on_release