@@ -28,6 +28,7 @@ set +o xtrace

 # Set up default directories

 GLANCE_DIR=$DEST/glance

+GLANCE_STORE_DIR=$DEST/glance_store

 GLANCECLIENT_DIR=$DEST/python-glanceclient

 GLANCE_CACHE_DIR=${GLANCE_CACHE_DIR:=$DATA_DIR/glance/cache}

 GLANCE_IMAGE_DIR=${GLANCE_IMAGE_DIR:=$DATA_DIR/glance/images}

@@ -263,6 +264,11 @@ function install_glanceclient {

 # install_glance() - Collect source and prepare

 function install_glance {

+    # Install glance_store from git so we make sure we're testing

+    # the latest code.

+    git_clone $GLANCE_STORE_REPO $GLANCE_STORE_DIR $GLANCE_STORE_BRANCH

+    setup_develop $GLANCE_STORE_DIR

+

     git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH

     setup_develop $GLANCE_DIR

 }

@@ -144,6 +144,9 @@ DIB_BRANCH=${DIB_BRANCH:-master}

 GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}

 GLANCE_BRANCH=${GLANCE_BRANCH:-master}

+GLANCE_STORE_REPO=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}

+GLANCE_STORE_BRANCH=${GLANCE_STORE_BRANCH:-master}

+

 # python glance client library

 GLANCECLIENT_REPO=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}

 GLANCECLIENT_BRANCH=${GLANCECLIENT_BRANCH:-master}