diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-26 20:24:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-26 20:24:58 +0000 |
| commit | 344495d292237939eeb80cfb69b8cff284b1065a (patch) | |
| tree | b5c1c28365c59046e23099281ddb818a6d5376e3 /tools | |
| parent | b2aeebd62e6fbc9a91f286c16e7f159bbb0e1042 (diff) | |
| parent | 1d9c5f914c77f4b8e6804ad7a1a40f9c8c40d34e (diff) | |
| download | kolla-344495d292237939eeb80cfb69b8cff284b1065a.tar.gz kolla-344495d292237939eeb80cfb69b8cff284b1065a.zip | |
Merge "Add missing openstack.env vars and export to heat"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/genenv | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/genenv b/tools/genenv index 535d7356c..e4cf50195 100755 --- a/tools/genenv +++ b/tools/genenv @@ -102,7 +102,9 @@ KEYSTONE_ADMIN_TOKEN=$PASSWORD KEYSTONE_DB_PASSWORD=kolla KEYSTONE_ADMIN_PASSWORD=$PASSWORD KEYSTONE_PUBLIC_SERVICE_HOST=$HOST_IP +KEYSTONE_PUBLIC_SERVICE_PORT=5000 KEYSTONE_ADMIN_SERVICE_HOST=$HOST_IP +KEYSTONE_ADMIN_SERVICE_PORT=35357 KEYSTONE_AUTH_PROTOCOL=http # Glance @@ -229,8 +231,10 @@ CINDER_ENABLED_BACKEND=lvm57 # Here we define pairs hostname:priority. Priorities have to be unique KEEPALIVED_HOST_PRIORITIES=host1:100,host2:99 +# this should use the keystone admin port +# https://bugs.launchpad.net/kolla/+bug/1469209 cat > ./openrc <<EOF -export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" +export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0" export OS_USERNAME=$ADMIN_TENANT_NAME export OS_PASSWORD=$ADMIN_USER_PASSWORD export OS_TENANT_NAME=$ADMIN_TENANT_NAME @@ -270,11 +274,12 @@ GLANCE_KEYSTONE_USER=$GLANCE_KEYSTONE_USER GLANCE_REGISTRY_SERVICE_HOST=$GLANCE_REGISTRY_SERVICE_HOST KEYSTONE_ADMIN_PASSWORD=$KEYSTONE_ADMIN_PASSWORD KEYSTONE_ADMIN_SERVICE_HOST=$KEYSTONE_ADMIN_SERVICE_HOST -KEYSTONE_ADMIN_SERVICE_PORT=35357 +KEYSTONE_ADMIN_SERVICE_PORT=$KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_ADMIN_TOKEN=$KEYSTONE_ADMIN_TOKEN KEYSTONE_AUTH_PROTOCOL=$KEYSTONE_AUTH_PROTOCOL KEYSTONE_DB_PASSWORD=$KEYSTONE_DB_PASSWORD KEYSTONE_PUBLIC_SERVICE_HOST=$KEYSTONE_PUBLIC_SERVICE_HOST +KEYSTONE_PUBLIC_SERVICE_PORT=$KEYSTONE_PUBLIC_SERVICE_PORT MARIADB_SERVICE_HOST=$HOST_IP MARIADB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD MARIADB_MAX_CONNECTIONS=$MARIADB_MAX_CONNECTIONS |