diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-03-26 01:21:01 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-03-26 01:21:01 +0000 |
| commit | 9cfaabec414e0a4e8b198d074f3012eff79be5ce (patch) | |
| tree | cd0360f4bda3aeb0f4cd12bac9b40754a3b4e243 | |
| parent | ed12a2cd2beef77d1c7e9d16771e766aa068530d (diff) | |
| parent | 5120ad458f011ec32d7e49af64319254d120b306 (diff) | |
| download | nova-9cfaabec414e0a4e8b198d074f3012eff79be5ce.tar.gz nova-9cfaabec414e0a4e8b198d074f3012eff79be5ce.tar.xz nova-9cfaabec414e0a4e8b198d074f3012eff79be5ce.zip | |
Updates to the newest version of nova.sh, which includes:
* Installing new python dependencies
* Allows for use of interfaces other than eth0
* Adds a run_detached mode for automated testing
| -rwxr-xr-x | contrib/nova.sh | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/contrib/nova.sh b/contrib/nova.sh index 55dfb971c..d7d34dcbd 100755 --- a/contrib/nova.sh +++ b/contrib/nova.sh @@ -18,6 +18,9 @@ if [ ! -n "$HOST_IP" ]; then fi USE_MYSQL=${USE_MYSQL:-0} +INTERFACE=${INTERFACE:-eth0} +FLOATING_RANGE=${FLOATING_RANGE:-10.6.0.0/27} +FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24} MYSQL_PASS=${MYSQL_PASS:-nova} TEST=${TEST:-0} USE_LDAP=${USE_LDAP:-0} @@ -72,11 +75,14 @@ if [ "$CMD" == "install" ]; then sudo modprobe kvm sudo /etc/init.d/libvirt-bin restart sudo modprobe nbd - sudo apt-get install -y python-twisted python-sqlalchemy python-mox python-greenlet python-carrot - sudo apt-get install -y python-migrate python-eventlet python-gflags python-ipy python-tempita - sudo apt-get install -y python-libvirt python-libxml2 python-routes python-cheetah - sudo apt-get install -y python-netaddr python-paste python-pastedeploy python-glance - sudo apt-get install -y python-multiprocessing + sudo apt-get install -y python-twisted python-mox python-ipy python-paste + sudo apt-get install -y python-migrate python-gflags python-greenlet + sudo apt-get install -y python-libvirt python-libxml2 python-routes + sudo apt-get install -y python-netaddr python-pastedeploy python-eventlet + sudo apt-get install -y python-novaclient python-glance python-cheetah + sudo apt-get install -y python-carrot python-tempita python-sqlalchemy + sudo apt-get install -y python-suds + if [ "$USE_IPV6" == 1 ]; then sudo apt-get install -y radvd @@ -105,7 +111,7 @@ function screen_it { screen -S nova -p $1 -X stuff "$2$NL" } -if [ "$CMD" == "run" ]; then +if [ "$CMD" == "run" ] || [ "$CMD" == "run_detached" ]; then cat >$NOVA_DIR/bin/nova.conf << NOVA_CONF_EOF --verbose @@ -113,6 +119,8 @@ if [ "$CMD" == "run" ]; then --dhcpbridge_flagfile=$NOVA_DIR/bin/nova.conf --network_manager=nova.network.manager.$NET_MAN --my_ip=$HOST_IP +--public_interface=$INTERFACE +--vlan_interface=$INTERFACE --sql_connection=$SQL_CONN --auth_driver=nova.auth.$AUTH --libvirt_type=$LIBVIRT_TYPE @@ -168,10 +176,13 @@ NOVA_CONF_EOF # create a project called 'admin' with project manager of 'admin' $NOVA_DIR/bin/nova-manage project create admin admin # create a small network - $NOVA_DIR/bin/nova-manage network create 10.0.0.0/8 1 32 + $NOVA_DIR/bin/nova-manage network create $FIXED_RANGE 1 32 # create some floating ips - $NOVA_DIR/bin/nova-manage floating create `hostname` 10.6.0.0/27 + $NOVA_DIR/bin/nova-manage floating create `hostname` $FLOATING_RANGE + + # convert old images + $NOVA_DIR/bin/nova-manage image convert $DIR/images # nova api crashes if we start it with a regular screen command, # so send the start command by forcing text into the window. @@ -187,8 +198,10 @@ NOVA_CONF_EOF $NOVA_DIR/bin/nova-manage project zipfile admin admin $NOVA_DIR/nova.zip unzip -o $NOVA_DIR/nova.zip -d $NOVA_DIR/ - screen_it test ". $NOVA_DIR/novarc" - screen -S nova -x + screen_it test "export PATH=$NOVA_DIR/bin:$PATH;. $NOVA_DIR/novarc" + if [ "$CMD" != "run_detached" ]; then + screen -S nova -x + fi fi if [ "$CMD" == "run" ] || [ "$CMD" == "terminate" ]; then |