minor tweaks - source stackrc/localrc for excercise.sh. Also, fix typo in build_lxc.sh
diff --git a/exercise.sh b/exercise.sh
index fb95fdf..f35adef 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -19,6 +19,9 @@
# 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_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
diff --git a/tools/build_lxc.sh b/tools/build_lxc.sh
index 193c8f0..df9e32e 100755
--- a/tools/build_lxc.sh
+++ b/tools/build_lxc.sh
@@ -138,7 +138,7 @@
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