Add Heat
diff --git a/README b/README
index ec5b849..ef7a43e 100644
--- a/README
+++ b/README
@@ -45,7 +45,7 @@
export FORMULAS_BRANCH=master
mkdir -p ${FORMULAS_PATH}
-declare -a formula_services=("linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "mysql" "grafana" "libvirt" "rsyslog" "memcached" "rabbitmq" "apache" "keystone" "glance" "nova" "neutron")
+declare -a formula_services=("linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "mysql" "grafana" "libvirt" "rsyslog" "memcached" "rabbitmq" "apache" "keystone" "glance" "nova" "neutron" "cinder" "heat")
for formula_service in "${formula_services[@]}"; do
_BRANCH=${FORMULAS_BRANCH}
[ ! -d "${FORMULAS_PATH}/${formula_service}" ] && {
@@ -90,6 +90,7 @@
vgcreate cinder-volume /dev/loop0
salt-call state.apply cinder
+salt-call state.apply heat
. /root/keystonercv3
diff --git a/classes/cluster/virtual-mcp-allinone/openstack/init.yml b/classes/cluster/virtual-mcp-allinone/openstack/init.yml
index d85f4e9..acea0b5 100755
--- a/classes/cluster/virtual-mcp-allinone/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-allinone/openstack/init.yml
@@ -10,12 +10,14 @@
- system.mysql.client.database.nova
- system.mysql.client.database.nova_api
- system.mysql.client.database.cinder
+- system.mysql.client.database.heat
- system.keystone.client.single
- system.keystone.client.service.nova
- system.keystone.client.service.nova-placement
- system.glance.control.single
- system.nova.control.single
- system.neutron.control.single
+- system.heat.server.single
- system.nova.compute.single
- service.neutron.gateway.single
- system.cinder.control.single
@@ -35,6 +37,7 @@
nova_version: ${_param:openstack_version}
neutron_version: ${_param:openstack_version}
cinder_version: ${_param:openstack_version}
+ heat_version: ${_param:openstack_version}
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_ceilometer_password: workshop
@@ -49,6 +52,7 @@
mysql_nova_password: workshop
mysql_neutron_password: workshop
mysql_cinder_password: workshop
+ mysql_heat_password: workshop
heat_service_host: ${_param:single_address}
neutron_service_host: ${_param:single_address}
glance_service_host: ${_param:single_address}
@@ -59,6 +63,7 @@
cluster_vip_address: ${_param:single_address}
cluster_local_address: ${_param:single_address}
tenant_address: ${_param:single_address}
+ heat_domain_admin_password: workshop
keystone:
server:
tokens:
@@ -112,3 +117,7 @@
volume:
cache:
members: ~
+ heat:
+ server:
+ message_queue:
+ virtual_host: openstack