remove some unused *_PROTOCOL from export
Things like SERVICE_PROTOCOL and KEYSTONE_AUTH_PROTOCOL shouldn't really be exported in openrc as they encourage using them directly to build up keystone urls instead of actually using the OS_AUTH_URL. Remove them. Change-Id: I4b7cc680f7f14dae29b706a227be540c9e212cad
This commit is contained in:
parent
227661e881
commit
0effa1a6cb
|
@ -48,8 +48,8 @@ TRACK_DEPENDS=${TRACK_DEPENDS:-False}
|
||||||
|
|
||||||
# Save these variables to .stackenv
|
# Save these variables to .stackenv
|
||||||
STACK_ENV_VARS="BASE_SQL_CONN DATA_DIR DEST ENABLED_SERVICES HOST_IP \
|
STACK_ENV_VARS="BASE_SQL_CONN DATA_DIR DEST ENABLED_SERVICES HOST_IP \
|
||||||
KEYSTONE_AUTH_PROTOCOL KEYSTONE_AUTH_URI KEYSTONE_SERVICE_URI \
|
KEYSTONE_AUTH_URI KEYSTONE_SERVICE_URI \
|
||||||
LOGFILE OS_CACERT SERVICE_HOST SERVICE_PROTOCOL STACK_USER TLS_IP \
|
LOGFILE OS_CACERT SERVICE_HOST STACK_USER TLS_IP \
|
||||||
HOST_IPV6 SERVICE_IP_VERSION"
|
HOST_IPV6 SERVICE_IP_VERSION"
|
||||||
|
|
||||||
|
|
||||||
|
|
2
openrc
2
openrc
|
@ -72,8 +72,6 @@ else
|
||||||
GLANCE_HOST=${GLANCE_HOST:-$HOST_IP}
|
GLANCE_HOST=${GLANCE_HOST:-$HOST_IP}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
|
|
||||||
|
|
||||||
# Identity API version
|
# Identity API version
|
||||||
export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-3}
|
export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-3}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue