summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorKei Masumoto <masumotok@nttdata.co.jp>2011-03-10 15:23:13 +0900
committerKei Masumoto <masumotok@nttdata.co.jp>2011-03-10 15:23:13 +0900
commit0dcd68077183c6cce60075a35be36f5c0764925b (patch)
treebda1a01e86bce51cbab70e10dbe284e28e6f8190 /contrib
parentb75ab789194f1ced801b1d68ae8cc54051716414 (diff)
parent144fa5082108f306595c5314f40d7e87cb577278 (diff)
downloadnova-0dcd68077183c6cce60075a35be36f5c0764925b.tar.gz
nova-0dcd68077183c6cce60075a35be36f5c0764925b.tar.xz
nova-0dcd68077183c6cce60075a35be36f5c0764925b.zip
merged to trunk rev781
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/nova.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/nova.sh b/contrib/nova.sh
index cf5b3de11..55dfb971c 100755
--- a/contrib/nova.sh
+++ b/contrib/nova.sh
@@ -167,9 +167,6 @@ NOVA_CONF_EOF
$NOVA_DIR/bin/nova-manage user admin admin admin admin
# 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 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
@@ -185,6 +182,11 @@ NOVA_CONF_EOF
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"
+ sleep 2
+ # export environment variables for project 'admin' and user 'admin'
+ $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
fi