diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-23 20:10:17 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-23 20:10:17 +0000 |
| commit | f066b83f89f0fb633b2a23108b3efd2d27f3d710 (patch) | |
| tree | 0c2659a712200033973b1a5c8f0a30e23e012427 /contrib | |
| parent | b2d474437c18df296758b79450abc909ce2c2e89 (diff) | |
| parent | 4bc6e8c467d0ff98b552b2f50622baf8b6175d3d (diff) | |
| download | nova-f066b83f89f0fb633b2a23108b3efd2d27f3d710.tar.gz | |
Fixes existing smoketests and splits out sysadmin tests from netadmin tests.
* sets use_ipv6 = False by default
* switches to ami-tty for tests
* generally improves error handling
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/nova.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/contrib/nova.sh b/contrib/nova.sh index 9259035ca0..1187f27287 100755 --- a/contrib/nova.sh +++ b/contrib/nova.sh @@ -66,7 +66,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 + sudo apt-get install -y socat unzip echo "ISCSITARGET_ENABLE=true" | sudo tee /etc/default/iscsitarget sudo /etc/init.d/iscsitarget restart sudo modprobe kvm @@ -111,8 +111,7 @@ if [ "$CMD" == "run" ]; then --nodaemon --dhcpbridge_flagfile=$NOVA_DIR/bin/nova.conf --network_manager=nova.network.manager.$NET_MAN ---cc_host=$HOST_IP ---routing_source_ip=$HOST_IP +--my_ip=$HOST_IP --sql_connection=$SQL_CONN --auth_driver=nova.auth.$AUTH --libvirt_type=$LIBVIRT_TYPE @@ -151,7 +150,6 @@ NOVA_CONF_EOF mkdir -p $NOVA_DIR/instances rm -rf $NOVA_DIR/networks mkdir -p $NOVA_DIR/networks - $NOVA_DIR/tools/clean-vlans if [ ! -d "$NOVA_DIR/images" ]; then ln -s $DIR/images $NOVA_DIR/images fi @@ -169,10 +167,14 @@ NOVA_CONF_EOF # create a project called 'admin' with project manager of 'admin' $NOVA_DIR/bin/nova-manage project create admin admin # export environment variables for project 'admin' and user 'admin' - $NOVA_DIR/bin/nova-manage project environment admin admin $NOVA_DIR/novarc + $NOVA_DIR/bin/nova-manage project zipfile admin admin $NOVA_DIR/nova.zip + unzip -o $NOVA_DIR/nova.zip -d $NOVA_DIR/ # create a small network $NOVA_DIR/bin/nova-manage network create 10.0.0.0/8 1 32 + # create some floating ips + $NOVA_DIR/bin/nova-manage floating create `hostname` 10.6.0.0/27 + # nova api crashes if we start it with a regular screen command, # so send the start command by forcing text into the window. screen_it api "$NOVA_DIR/bin/nova-api" |