Browse code

Merge "Move SERVICE_PROTOCOL from stack.sh to stackrc"

Jenkins authored on 2014/07/27 04:51:22
Showing 2 changed files
... ...
@@ -308,9 +308,6 @@ fi
308 308
 # Allow the use of an alternate hostname (such as localhost/127.0.0.1) for service endpoints.
309 309
 SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
310 310
 
311
-# Allow the use of an alternate protocol (such as https) for service endpoints
312
-SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
313
-
314 311
 # Configure services to use syslog instead of writing to individual log files
315 312
 SYSLOG=`trueorfalse False $SYSLOG`
316 313
 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: