openstack/kayobe
Code Issues Proposed changes

Add support for free-form configuration of heat

Browse Source
This commit is contained in:
Mark Goddard 2017-11-16 14:04:36 +00:00
parent a451ce4142
commit f43ac2e0be
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/kolla-openstack.yml
View File

@ -81,6 +81,7 @@
register: stat_result register: stat_result
with_items: with_items:
- { name: glance, file: glance.conf } - { name: glance, file: glance.conf }
- { name: heat, file: heat.conf }
- { name: inspector, file: ironic-inspector.conf } - { name: inspector, file: ironic-inspector.conf }
- { name: ironic, file: ironic.conf } - { name: ironic, file: ironic.conf }
- { name: ironic_dnsmasq, file: ironic/ironic-dnsmasq.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 }}" kolla_inspector_default_gateway: "{{ inspection_net_name | net_inspection_gateway or inspection_net_name | net_gateway }}"
# Extra free-form user-provided configuration. # Extra free-form user-provided configuration.
kolla_extra_glance: "{{ kolla_extra_config.glance | default }}" 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_inspector: "{{ kolla_extra_config.inspector | default }}"
kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}" kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}"
kolla_extra_ironic_dnsmasq: "{{ kolla_extra_config.ironic_dnsmasq | default }}" kolla_extra_ironic_dnsmasq: "{{ kolla_extra_config.ironic_dnsmasq | default }}"

9
ansible/roles/kolla-openstack/defaults/main.yml
View File

@ -15,6 +15,15 @@ kolla_enable_glance:
# glance-registry.conf. # glance-registry.conf.
kolla_extra_glance: 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. # Ironic configuration.

9
ansible/roles/kolla-openstack/templates/heat.conf.j2 Normal file
View File

@ -0,0 +1,9 @@
# {{ ansible_managed }}
{% if kolla_extra_heat %}
#######################
# Extra configuration
#######################
{{ kolla_extra_heat }}
{% endif %}