From ed376c38ebe257e438875fd68077c61e45744aa9 Mon Sep 17 00:00:00 2001
From: Valeriy Ponomaryov <vponomaryov@mirantis.com>
Date: Fri, 19 Jun 2015 14:49:03 +0300
Subject: [PATCH] [stable/juno] Nail Manila branch and Manilaclient tag in
 Devstack

stable/juno branch of Manila is not compatible with latest Manilaclient,
so set compatible tag "1.0.1" for Manilaclient in Devstack and "stable/juno"
branch for Manila itself, which will be useful for local deployments by users.

Change-Id: I3e2092e3fa37d52d1b96de501efc711ab8a24827
---
 contrib/devstack/lib/manila | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/devstack/lib/manila b/contrib/devstack/lib/manila
index 444116c13f..a4b54b9fc9 100644
--- a/contrib/devstack/lib/manila
+++ b/contrib/devstack/lib/manila
@@ -27,10 +27,10 @@ set +o xtrace
 MANILA_REPO_ROOT=openstack
 MANILA_GIT_BASE=${MANILA_GIT_BASE:-https://github.com}
 MANILA_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/manila.git
-MANILA_BRANCH=master
+MANILA_BRANCH="stable/juno"
 
 MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git
-MANILACLIENT_BRANCH=master
+MANILACLIENT_BRANCH="refs/tags/1.0.1"
 
 # set up default directories
 MANILA_DIR=${MANILA_DIR:=$DEST/manila}