Merge "Move SERVICE_PROTOCOL from stack.sh to stackrc"

This commit is contained in:
Jenkins 2014-07-26 19:51:22 +00:00 committed by Gerrit Code Review
commit e8ebb4901f
2 changed files with 3 additions and 3 deletions

View File

@ -308,9 +308,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}

View File

@ -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: