Browse code

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

Sean Dague authored on 2017/04/19 04:16:37
Showing 2 changed files
... ...
@@ -48,8 +48,8 @@ TRACK_DEPENDS=${TRACK_DEPENDS:-False}
48 48
 
49 49
 # Save these variables to .stackenv
50 50
 STACK_ENV_VARS="BASE_SQL_CONN DATA_DIR DEST ENABLED_SERVICES HOST_IP \
51
-    KEYSTONE_AUTH_PROTOCOL KEYSTONE_AUTH_URI KEYSTONE_SERVICE_URI \
52
-    LOGFILE OS_CACERT SERVICE_HOST SERVICE_PROTOCOL STACK_USER TLS_IP \
51
+    KEYSTONE_AUTH_URI KEYSTONE_SERVICE_URI \
52
+    LOGFILE OS_CACERT SERVICE_HOST STACK_USER TLS_IP \
53 53
     HOST_IPV6 SERVICE_IP_VERSION"
54 54
 
55 55
 
... ...
@@ -72,8 +72,6 @@ else
72 72
     GLANCE_HOST=${GLANCE_HOST:-$HOST_IP}
73 73
 fi
74 74
 
75
-SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
76
-
77 75
 # Identity API version
78 76
 export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-3}
79 77