diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-24 05:58:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-24 05:58:50 +0000 |
| commit | 2336ba39d49b9a463ce627b1a8dbc3f3f866252d (patch) | |
| tree | 906119bb28de2535005789b47fbc17a56d50022e /tools | |
| parent | cfcbb2f4fa903d81ff075622a8d8d0c70302a361 (diff) | |
| parent | 1962bfb16e70835af83d93155018933dec866f30 (diff) | |
| download | kolla-2336ba39d49b9a463ce627b1a8dbc3f3f866252d.tar.gz kolla-2336ba39d49b9a463ce627b1a8dbc3f3f866252d.zip | |
Merge "Fix Heat container env vars and dependencies"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/genenv | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/genenv b/tools/genenv index 5fdc8a7ba..aea05ab39 100755 --- a/tools/genenv +++ b/tools/genenv @@ -132,9 +132,13 @@ NEUTRON_SHARED_SECRET=sharedsecret # Heat HEAT_DB_NAME=heat HEAT_DB_PASSWORD=kolla +HEAT_KEYSTONE_USER=heat HEAT_KEYSTONE_PASSWORD=heat +HEAT_CFN_KEYSTONE_USER=heat-cfn +HEAT_CFN_KEYSTONE_PASSWORD=heat HEAT_API_SERVICE_HOST=$HOST_IP HEAT_API_CFN_SERVICE_HOST=$HOST_IP +HEAT_API_CFN_SERVICE_PORT=8000 HEAT_API_CFN_URL_HOST=$HOST_IP # Magnum @@ -272,8 +276,14 @@ NEUTRON_FLAT_NETWORK_NAME=$NEUTRON_FLAT_NETWORK_NAME NEUTRON_FLAT_NETWORK_INTERFACE=$NEUTRON_FLAT_NETWORK_INTERFACE HEAT_DB_NAME=$HEAT_DB_NAME HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD +HEAT_KEYSTONE_USER=$HEAT_KEYSTONE_USER HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD +HEAT_CFN_KEYSTONE_USER=$HEAT_CFN_KEYSTONE_USER +HEAT_CFN_KEYSTONE_PASSWORD=$HEAT_CFN_KEYSTONE_PASSWORD HEAT_API_SERVICE_HOST=$HEAT_API_SERVICE_HOST +HEAT_API_CFN_SERVICE_HOST=$HEAT_API_CFN_SERVICE_HOST +HEAT_API_CFN_SERVICE_PORT=$HEAT_API_CFN_SERVICE_PORT +HEAT_API_CFN_URL_HOST=$HEAT_API_CFN_URL_HOST MAGNUM_DB_NAME=$MAGNUM_DB_NAME MAGNUM_DB_PASSWORD=$MAGNUM_DB_PASSWORD MAGNUM_KEYSTONE_PASSWORD=$MAGNUM_KEYSTONE_PASSWORD @@ -286,7 +296,6 @@ RABBITMQ_SERVICE_HOST=$RABBITMQ_SERVICE_HOST RABBITMQ_USER=$RABBIT_USER RABBIT_PASSWORD=$RABBIT_PASSWORD RABBIT_USERID=$RABBIT_USER -HEAT_API_CFN_SERVICE_HOST=$HEAT_API_CFN_SERVICE_HOST DESIGNATE_DB_NAME=$DESIGNATE_DB_NAME DESIGNATE_DB_USER=$DESIGNATE_DB_USER DESIGNATE_DB_PASSWORD=$DESIGNATE_DB_PASSWORD |