diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-21 03:15:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-21 03:15:38 +0000 |
| commit | a99a861bc01dba543150a458d90f52b29e38bebc (patch) | |
| tree | e399f47162229b66544ccc1055b0a3d64a16c8ed /tools | |
| parent | 64f59e229c4d64f6e494f97a5465cd28a7621356 (diff) | |
| parent | dbddef4f7840caed6cf79eb39f721e1f29426481 (diff) | |
| download | kolla-a99a861bc01dba543150a458d90f52b29e38bebc.tar.gz kolla-a99a861bc01dba543150a458d90f52b29e38bebc.zip | |
Merge "Improve Heat integration"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/genenv | 10 | ||||
| -rwxr-xr-x | tools/start | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tools/genenv b/tools/genenv index 7160420c7..761ba3ec4 100755 --- a/tools/genenv +++ b/tools/genenv @@ -65,6 +65,12 @@ NOVA_PUBLIC_INTERFACE=$MY_DEV NOVA_FLAT_INTERFACE=$MY_DEV CONFIG_NETWORK=True +# Heat +HEAT_DB_NAME=heat +HEAT_DB_PASSWORD=kolla +HEAT_KEYSTONE_PASSWORD=heat +HEAT_API_SERVICE_HOST=$HOST_IP + cat > ./openrc <<EOF export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" export OS_USERNAME=$ADMIN_TENANT_NAME @@ -103,6 +109,10 @@ NOVA_EC2_API_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST NOVA_EC2_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST NOVA_KEYSTONE_PASSWORD=$NOVA_KEYSTONE_PASSWORD NOVA_KEYSTONE_USER=$NOVA_KEYSTONE_USER +HEAT_DB_NAME=$HEAT_DB_NAME +HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD +HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD +HEAT_API_SERVICE_HOST=$HEAT_API_SERVICE_HOST PUBLIC_INTERFACE=$NOVA_PUBLIC_INTERFACE PUBLIC_IP=$HOST_IP PUBLIC_IP=$PUBLIC_IP diff --git a/tools/start b/tools/start index 887ec8ab1..79527b2e5 100755 --- a/tools/start +++ b/tools/start @@ -46,6 +46,9 @@ docker-compose -f ./compose/nova-api-conductor-scheduler.yml up -d echo Starting nova compute with nova networking. docker-compose -f ./compose/nova-compute-network.yml up -d +echo Starting heat. +docker-compose -f ./compose/heat-api-engine.yml up -d + IMAGE_URL=http://download.cirros-cloud.net/0.3.3/ IMAGE=cirros-0.3.3-x86_64-disk.img if ! [ -f "$IMAGE" ]; then |