Browse code

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

Rob Crittenden authored on 2014/07/24 09:29:57
Showing 2 changed files
... ...
@@ -317,9 +317,6 @@ fi
317 317
 # Allow the use of an alternate hostname (such as localhost/127.0.0.1) for service endpoints.
318 318
 SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
319 319
 
320
-# Allow the use of an alternate protocol (such as https) for service endpoints
321
-SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
322
-
323 320
 # Configure services to use syslog instead of writing to individual log files
324 321
 SYSLOG=`trueorfalse False $SYSLOG`
325 322
 SYSLOG_HOST=${SYSLOG_HOST:-$HOST_IP}
... ...
@@ -431,6 +431,9 @@ INSTALL_TESTONLY_PACKAGES=${INSTALL_TESTONLY_PACKAGES:-False}
431 431
 # Undo requirements changes by global requirements
432 432
 UNDO_REQUIREMENTS=${UNDO_REQUIREMENTS:-True}
433 433
 
434
+# Allow the use of an alternate protocol (such as https) for service endpoints
435
+SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
436
+
434 437
 # Local variables:
435 438
 # mode: shell-script
436 439
 # End: