merged trunk

2011-01-13 01:57:53 -08:00
parent a6b82b3015 621cf8e156
commit 0e307db62b
272 changed files with 11628 additions and 2218 deletions
@@ -78,6 +78,7 @@ if [ "$CMD" == "install" ]; then
    sudo apt-get install -y user-mode-linux kvm libvirt-bin
    sudo apt-get install -y screen euca2ools vlan curl rabbitmq-server
    sudo apt-get install -y lvm2 iscsitarget open-iscsi
+    sudo apt-get install -y socat
    echo "ISCSITARGET_ENABLE=true" | sudo tee /etc/default/iscsitarget
    sudo /etc/init.d/iscsitarget restart
    sudo modprobe kvm
@@ -156,6 +157,7 @@ if [ "$CMD" == "run" ]; then
    screen_it network "$NOVA_DIR/bin/nova-network"
    screen_it scheduler "$NOVA_DIR/bin/nova-scheduler"
    screen_it volume "$NOVA_DIR/bin/nova-volume"
+    screen_it ajax_console_proxy "$NOVA_DIR/bin/nova-ajax-console-proxy"
    screen_it test ". $NOVA_DIR/novarc"
    screen -S nova -x
 fi