diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index 986970c72..3aaf3f938 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -81,6 +81,7 @@
           register: stat_result
           with_items:
             - { name: glance, file: glance.conf }
+            - { name: heat, file: heat.conf }
             - { name: inspector, file: ironic-inspector.conf }
             - { name: ironic, file: ironic.conf }
             - { name: ironic_dnsmasq, file: ironic/ironic-dnsmasq.conf }
@@ -174,6 +175,7 @@
       kolla_inspector_default_gateway: "{{ inspection_net_name | net_inspection_gateway or inspection_net_name | net_gateway }}"
       # Extra free-form user-provided configuration.
       kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
+      kolla_extra_heat: "{{ kolla_extra_config.heat | default }}"
       kolla_extra_inspector: "{{ kolla_extra_config.inspector | default }}"
       kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}"
       kolla_extra_ironic_dnsmasq: "{{ kolla_extra_config.ironic_dnsmasq | default }}"
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 0b22805e8..d1bf9e7a0 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -15,6 +15,15 @@ kolla_enable_glance:
 # glance-registry.conf.
 kolla_extra_glance:
 
+###############################################################################
+# Heat configuration.
+
+# Whether to enable Heat.
+kolla_enable_heat:
+
+# Free form extra configuration to append to heat.conf.
+kolla_extra_heat:
+
 ###############################################################################
 # Ironic configuration.
 
diff --git a/ansible/roles/kolla-openstack/templates/heat.conf.j2 b/ansible/roles/kolla-openstack/templates/heat.conf.j2
new file mode 100644
index 000000000..586fcc32a
--- /dev/null
+++ b/ansible/roles/kolla-openstack/templates/heat.conf.j2
@@ -0,0 +1,9 @@
+# {{ ansible_managed }}
+
+{% if kolla_extra_heat %}
+#######################
+# Extra configuration
+#######################
+
+{{ kolla_extra_heat }}
+{% endif %}