From 4f78f8f3911e8b57b46ed8f50e2c412a8ea39a4d Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Tue, 9 Sep 2014 09:37:42 +0200
Subject: [PATCH] Test against latest glance_store code

Install glance_store from git so we can test Glance against master. This
is useful for both, glance and glance_store gates, to make sure nothing
is broken there.

Change-Id: I6c01165c4384c41f46f2c32d64475703b3178dab
---
 lib/glance | 6 ++++++
 stackrc    | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/lib/glance b/lib/glance
index 7a28b68717..3358d22ccc 100644
--- a/lib/glance
+++ b/lib/glance
@@ -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}
@@ -252,6 +253,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
 }
diff --git a/stackrc b/stackrc
index e0711326cc..8663a7b623 100644
--- a/stackrc
+++ b/stackrc
@@ -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}