openstack
/
devstack
Code Issues Proposed changes

Merge "remove some unused *_PROTOCOL from export"

This commit is contained in:
Jenkins 2017-05-16 14:46:50 +00:00 committed by Gerrit Code Review
parent 7834f5285f 0effa1a6cb
commit 3420019d9d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions-common
View File

@ -48,8 +48,8 @@ TRACK_DEPENDS=${TRACK_DEPENDS:-False}
# Save these variables to .stackenv
STACK_ENV_VARS="BASE_SQL_CONN DATA_DIR DEST ENABLED_SERVICES HOST_IP \
KEYSTONE_AUTH_PROTOCOL KEYSTONE_AUTH_URI KEYSTONE_SERVICE_URI \
LOGFILE OS_CACERT SERVICE_HOST SERVICE_PROTOCOL STACK_USER TLS_IP \
KEYSTONE_AUTH_URI KEYSTONE_SERVICE_URI \
LOGFILE OS_CACERT SERVICE_HOST STACK_USER TLS_IP \
HOST_IPV6 SERVICE_IP_VERSION"

2
openrc
View File

@ -72,8 +72,6 @@ else
GLANCE_HOST=${GLANCE_HOST:-$HOST_IP}
fi
SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
# Identity API version
export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-3}