@@ -19,6 +19,9 @@ set -o xtrace

 # Settings

 # ========

+# Use stackrc and localrc for settings

+source ./stackrc

+

 HOST=${HOST:-localhost}

 # Nova original used project_id as the *account* that owned resources (servers,

@@ -33,7 +36,7 @@ export NOVA_PROJECT_ID=${TENANT:-demo}

 export NOVA_USERNAME=${USERNAME:-demo}

 # With Keystone you pass the keystone password instead of an api key.

-export NOVA_API_KEY=${PASSWORD:-secrete}

+export NOVA_API_KEY=${ADMIN_PASSWORD:-secrete}

 # With the addition of Keystone, to use an openstack cloud you should 

 # authenticate against keystone, which returns a **Token** and **Service 

@@ -138,7 +138,7 @@ mkdir -p $CACHEDIR/$DEST

 git_clone $NOVA_REPO $CACHEDIR/$DEST/nova $NOVA_BRANCH

 git_clone $GLANCE_REPO $CACHEDIR/$DEST/glance $GLANCE_BRANCH

 git_clone $KEYSTONE_REPO $CACHEDIR/$DESTkeystone $KEYSTONE_BRANCH

-git_clone $NOVNC_REPO $CACHEDIR/$DEST/novnc $NOVNC_BRANCH

+git_clone $NOVNC_REPO $CACHEDIR/$DEST/noVNC $NOVNC_BRANCH

 git_clone $DASH_REPO $CACHEDIR/$DEST/dash $DASH_BRANCH $DASH_TAG

 git_clone $NOVACLIENT_REPO $CACHEDIR/$DEST/python-novaclient $NOVACLIENT_BRANCH

 git_clone $OPENSTACKX_REPO $CACHEDIR/$DEST/openstackx $OPENSTACKX_BRANCH