From 26867a63c14cea76a5a36e835ce7cb18bec98eac Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Wed, 23 Jul 2014 20:29:57 -0400
Subject: [PATCH] Move SERVICE_PROTOCOL from stack.sh to stackrc

This ensures that SERVICE_PROTOCOL is available to other consumers
of the devstack environment like grenade.

Change-Id: I702d7d239e50dd1446d55c076c7a7c57768486ff
Closes-Bug: 1335953
---
 stack.sh | 3 ---
 stackrc  | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stack.sh b/stack.sh
index cdfa3dafc3..56c4f0ed19 100755
--- a/stack.sh
+++ b/stack.sh
@@ -317,9 +317,6 @@ fi
 # Allow the use of an alternate hostname (such as localhost/127.0.0.1) for service endpoints.
 SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
 
-# Allow the use of an alternate protocol (such as https) for service endpoints
-SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
-
 # Configure services to use syslog instead of writing to individual log files
 SYSLOG=`trueorfalse False $SYSLOG`
 SYSLOG_HOST=${SYSLOG_HOST:-$HOST_IP}
diff --git a/stackrc b/stackrc
index a05fc1851a..9701d2d7cc 100644
--- a/stackrc
+++ b/stackrc
@@ -431,6 +431,9 @@ INSTALL_TESTONLY_PACKAGES=${INSTALL_TESTONLY_PACKAGES:-False}
 # Undo requirements changes by global requirements
 UNDO_REQUIREMENTS=${UNDO_REQUIREMENTS:-True}
 
+# Allow the use of an alternate protocol (such as https) for service endpoints
+SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
+
 # Local variables:
 # mode: shell-script
 # End: