diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-08-04 12:24:31 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-08-04 12:24:31 +0000 |
| commit | 07460f88f2724066991f5d66d4b5cd37a6700bdb (patch) | |
| tree | fb000b621a4eb7d68039e893f557fd9a8cbb97ea | |
| parent | 853fa539295364a11150969c0ec2caa15757e7f2 (diff) | |
| download | kolla-07460f88f2724066991f5d66d4b5cd37a6700bdb.tar.gz kolla-07460f88f2724066991f5d66d4b5cd37a6700bdb.zip | |
Add missing vars for Keystone
Got removed as part of a refactor
Change-Id: I7dc47f4af316188803fe2fc654316540b8d23cf8
Closes-Bug: #1480465
| -rwxr-xr-x | tools/genenv | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/genenv b/tools/genenv index 36535ab3f..c9d8b7a74 100755 --- a/tools/genenv +++ b/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 |