Merge "Improve Heat integration"
This commit is contained in:
commit
a99a861bc0
@ -70,6 +70,10 @@ all containers. This allows a simple method of ensuring every type of node
|
|||||||
NOVA_EC2_SERVICE_HOST=<IP> _ The IP Address wher ethe Nova EC2 service is hosted
|
NOVA_EC2_SERVICE_HOST=<IP> _ The IP Address wher ethe Nova EC2 service is hosted
|
||||||
NOVA_KEYSTONE_PASSWORD=<password> - The Nova keystone password
|
NOVA_KEYSTONE_PASSWORD=<password> - The Nova keystone password
|
||||||
NOVA_KEYSTONE_USER=<nova> - The Nova keystone username
|
NOVA_KEYSTONE_USER=<nova> - The Nova keystone username
|
||||||
|
HEAT_DB_NAME=<heat> - The heat DB name
|
||||||
|
HEAT_DB_PASSWORD=<kolla> - The heat db password
|
||||||
|
HEAT_KEYSTONE_PASSWORD=<heat> - The keystone password for the heat user
|
||||||
|
HEAT_API_SERVICE_HOST=<IP> - The IP Address where the Heat API service is hosted
|
||||||
PUBLIC_INTERFACE=<eth1> - The nova public interface
|
PUBLIC_INTERFACE=<eth1> - The nova public interface
|
||||||
PUBLIC_IP=<Host IP Address> - The IP Address of this host
|
PUBLIC_IP=<Host IP Address> - The IP Address of this host
|
||||||
RABBITMQ_PASS=<rabbit> - The rabbitmq password used to join AMQP
|
RABBITMQ_PASS=<rabbit> - The rabbitmq password used to join AMQP
|
||||||
|
10
tools/genenv
10
tools/genenv
@ -65,6 +65,12 @@ NOVA_PUBLIC_INTERFACE=$MY_DEV
|
|||||||
NOVA_FLAT_INTERFACE=$MY_DEV
|
NOVA_FLAT_INTERFACE=$MY_DEV
|
||||||
CONFIG_NETWORK=True
|
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
|
cat > ./openrc <<EOF
|
||||||
export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
|
export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
|
||||||
export OS_USERNAME=$ADMIN_TENANT_NAME
|
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_EC2_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST
|
||||||
NOVA_KEYSTONE_PASSWORD=$NOVA_KEYSTONE_PASSWORD
|
NOVA_KEYSTONE_PASSWORD=$NOVA_KEYSTONE_PASSWORD
|
||||||
NOVA_KEYSTONE_USER=$NOVA_KEYSTONE_USER
|
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_INTERFACE=$NOVA_PUBLIC_INTERFACE
|
||||||
PUBLIC_IP=$HOST_IP
|
PUBLIC_IP=$HOST_IP
|
||||||
PUBLIC_IP=$PUBLIC_IP
|
PUBLIC_IP=$PUBLIC_IP
|
||||||
|
@ -46,6 +46,9 @@ docker-compose -f ./compose/nova-api-conductor-scheduler.yml up -d
|
|||||||
echo Starting nova compute with nova networking.
|
echo Starting nova compute with nova networking.
|
||||||
docker-compose -f ./compose/nova-compute-network.yml up -d
|
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_URL=http://download.cirros-cloud.net/0.3.3/
|
||||||
IMAGE=cirros-0.3.3-x86_64-disk.img
|
IMAGE=cirros-0.3.3-x86_64-disk.img
|
||||||
if ! [ -f "$IMAGE" ]; then
|
if ! [ -f "$IMAGE" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user