File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ set +o xtrace
2828
2929# Set up default directories
3030GLANCE_DIR=$DEST/glance
31+ GLANCE_STORE_DIR=$DEST/glance_store
3132GLANCECLIENT_DIR=$DEST/python-glanceclient
3233GLANCE_CACHE_DIR=${GLANCE_CACHE_DIR:=$DATA_DIR/glance/cache}
3334GLANCE_IMAGE_DIR=${GLANCE_IMAGE_DIR:=$DATA_DIR/glance/images}
@@ -263,6 +264,11 @@ function install_glanceclient {
263264
264265# install_glance() - Collect source and prepare
265266function install_glance {
267+ # Install glance_store from git so we make sure we're testing
268+ # the latest code.
269+ git_clone $GLANCE_STORE_REPO $GLANCE_STORE_DIR $GLANCE_STORE_BRANCH
270+ setup_develop $GLANCE_STORE_DIR
271+
266272 git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
267273 setup_develop $GLANCE_DIR
268274}
Original file line number Diff line number Diff line change @@ -144,6 +144,9 @@ DIB_BRANCH=${DIB_BRANCH:-master}
144144GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
145145GLANCE_BRANCH=${GLANCE_BRANCH:-master}
146146
147+ GLANCE_STORE_REPO=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}
148+ GLANCE_STORE_BRANCH=${GLANCE_STORE_BRANCH:-master}
149+
147150# python glance client library
148151GLANCECLIENT_REPO=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}
149152GLANCECLIENT_BRANCH=${GLANCECLIENT_BRANCH:-master}
You can’t perform that action at this time.
0 commit comments