openstack/kayobe
Code Issues Proposed changes

Support extra user configuration for magnum.conf

Browse Source
This commit is contained in:
Mark Goddard 2017-05-11 19:03:10 +01:00
parent 17babeba3f
commit 6e64a78f94
4 changed files with 21 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

@ -17,6 +17,7 @@
- { name: glance, file: glance.conf } - { name: glance, file: glance.conf }
- { name: inspector, file: ironic-inspector.conf } - { name: inspector, file: ironic-inspector.conf }
- { name: ironic, file: ironic.conf } - { name: ironic, file: ironic.conf }
- { name: magnum, file: magnum.conf }
- { name: neutron, file: neutron.conf } - { name: neutron, file: neutron.conf }
- { name: neutron_ml2, file: neutron/ml2_conf.ini } - { name: neutron_ml2, file: neutron/ml2_conf.ini }
@ -81,5 +82,6 @@
kolla_extra_glance: "{{ kolla_extra_config.glance | default }}" kolla_extra_glance: "{{ kolla_extra_config.glance | 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_magnum: "{{ kolla_extra_config.magnum | default }}"
kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}" kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}"
kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}" kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}"

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

@ -159,6 +159,15 @@ kolla_inspector_dhcp_pool_start:
# End of range of IP addresses for dnsmasq to allocate from. # End of range of IP addresses for dnsmasq to allocate from.
kolla_inspector_dhcp_pool_end: kolla_inspector_dhcp_pool_end:
###############################################################################
# Magnum configuration.
# Whether to enable Magnum.
kolla_enable_magnum:
# Free form extra configuration to append to magnum.conf.
kolla_magnum_extra:
############################################################################### ###############################################################################
# Neutron configuration. # Neutron configuration.

1
ansible/roles/kolla-openstack/tasks/config.yml
View File

@ -20,6 +20,7 @@
- { src: ironic.conf.j2, dest: ironic.conf, enabled: "{{ kolla_enable_ironic }}" } - { src: ironic.conf.j2, dest: ironic.conf, enabled: "{{ kolla_enable_ironic }}" }
- { src: ironic-dnsmasq.conf.j2, dest: ironic/ironic-dnsmasq.conf, enabled: "{{ kolla_enable_ironic }}" } - { src: ironic-dnsmasq.conf.j2, dest: ironic/ironic-dnsmasq.conf, enabled: "{{ kolla_enable_ironic }}" }
- { src: ironic-inspector.conf.j2, dest: ironic-inspector.conf, enabled: "{{ kolla_enable_ironic }}" } - { src: ironic-inspector.conf.j2, dest: ironic-inspector.conf, enabled: "{{ kolla_enable_ironic }}" }
- { src: magnum.conf.j2, dest: magnum.conf, enabled: "{{ kolla_enable_magnum }}" }
- { src: ml2_conf.ini.j2, dest: neutron/ml2_conf.ini, enabled: "{{ kolla_enable_neutron }}" } - { src: ml2_conf.ini.j2, dest: neutron/ml2_conf.ini, enabled: "{{ kolla_enable_neutron }}" }
- { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" } - { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" }
- { src: pxelinux.default.j2, dest: ironic/pxelinux.default, enabled: "{{ kolla_enable_ironic }}" } - { src: pxelinux.default.j2, dest: ironic/pxelinux.default, enabled: "{{ kolla_enable_ironic }}" }

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

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