From bcd77d1c0239c73bd791268af086f61f959f0c1a Mon Sep 17 00:00:00 2001
From: chen-li <shchenli@cn.ibm.com>
Date: Mon, 27 Jun 2016 21:11:50 -0500
Subject: [PATCH] Remove 'origin/' in OVS_BRANCH

When use origin/master, if we re-installed the devstack with a
RECLONE=True, an error will happen with the error message:
  [ERROR] /opt/stack/devstack/functions-common:560 origin/master is neither branch nor tag

Use the branch name without 'origin/' works the same.

Similar change: https://review.openstack.org/#/c/333826

Change-Id: I16f6bd28ad27d4e957c226ed3fceb8881af6e84f
---
 devstack/lib/ovs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/lib/ovs b/devstack/lib/ovs
index a889b6eac34..287e3e48dff 100644
--- a/devstack/lib/ovs
+++ b/devstack/lib/ovs
@@ -12,7 +12,7 @@
 
 OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
 OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.')
-OVS_BRANCH=${OVS_BRANCH:-origin/master}
+OVS_BRANCH=${OVS_BRANCH:-master}
 
 # Functions