Merge "Add missing vars for Keystone"

tools/genenv

@@ -230,6 +230,7 @@ KEYSTONE_ADMIN_PASSWORD=$PASSWORD
 KEYSTONE_ADMIN_SERVICE_HOST=$HOST_IP
 KEYSTONE_ADMIN_SERVICE_PORT=35357
 KEYSTONE_ADMIN_TOKEN=$PASSWORD
+KEYSTONE_API_VERSION=2.0
 KEYSTONE_AUTH_PROTOCOL=http
 KEYSTONE_DB_NAME=keystone
 KEYSTONE_DB_PASSWORD=kolla
@@ -239,6 +240,7 @@ KEYSTONE_PUBLIC_SERVICE_PORT=5000
 KEYSTONE_USER=keystone
 TOKEN_DRIVER=sql
 TOKEN_PROVIDER=uuid
+USE_STDERR=false
 
 # Keepalived
 # Here we define pairs hostname:priority. Priorities have to be unique
@@ -391,6 +393,7 @@ EOF
 
 cat > ./compose/openstack.env <<EOF
 ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME
+ADMIN_USER=$ADMIN_USER
 ADMIN_USER_PASSWORD=$ADMIN_USER_PASSWORD
 BARBICAN_ADMIN_SERVICE_PORT=$BARBICAN_ADMIN_SERVICE_PORT
 BARBICAN_DB_NAME=$BARBICAN_DB_NAME
@@ -506,6 +509,7 @@ KEYSTONE_ADMIN_PASSWORD=$KEYSTONE_ADMIN_PASSWORD
 KEYSTONE_ADMIN_SERVICE_HOST=$KEYSTONE_ADMIN_SERVICE_HOST
 KEYSTONE_ADMIN_SERVICE_PORT=$KEYSTONE_ADMIN_SERVICE_PORT
 KEYSTONE_ADMIN_TOKEN=$KEYSTONE_ADMIN_TOKEN
+KEYSTONE_API_VERSION=$KEYSTONE_API_VERSION
 KEYSTONE_AUTH_PROTOCOL=$KEYSTONE_AUTH_PROTOCOL
 KEYSTONE_AUTH_PROTOCOL=$KEYSTONE_AUTH_PROTOCOL
 KEYSTONE_DB_NAME=$KEYSTONE_DB_NAME
@@ -650,6 +654,7 @@ TOKEN_DRIVER=$TOKEN_DRIVER
 TOKEN_PROVIDER=$TOKEN_PROVIDER
 TYPE_DRIVERS=$TYPE_DRIVERS
 USE_NAMESPACES=$USE_NAMESPACES
+USE_STDERR=$USE_STDERR
 VERBOSE_LOGGING=$VERBOSE_LOGGING
 ZAQAR_KEYSTONE_USER=$ZAQAR_KEYSTONE_USER
 ZAQAR_SERVER_SERVICE_PORT=$ZAQAR_SERVER_SERVICE_PORT