diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-10 00:49:06 -0500 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-10 00:49:06 -0500 |
| commit | 5a7a52da980d28eff9da7bfda8b4e7241a58d230 (patch) | |
| tree | b2758ebca2561bb1608f497b39daefe00b9be2a4 | |
| parent | 90f38451e5df4f0ca862401cf898f01ffede6174 (diff) | |
| parent | 6b40f2108e537d9620229760b95a4ced79853626 (diff) | |
| download | nova-5a7a52da980d28eff9da7bfda8b4e7241a58d230.tar.gz nova-5a7a52da980d28eff9da7bfda8b4e7241a58d230.tar.xz nova-5a7a52da980d28eff9da7bfda8b4e7241a58d230.zip | |
merge lp:nova
| -rwxr-xr-x | contrib/nova.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/nova.sh b/contrib/nova.sh index 1187f2728..d6c9b1081 100755 --- a/contrib/nova.sh +++ b/contrib/nova.sh @@ -166,9 +166,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 @@ -184,6 +181,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 |