Add designate config override

This commit is contained in:
Kevin TIBI 2018-02-07 17:14:40 +01:00
parent 58efaee1b7
commit c77ac65deb
5 changed files with 26 additions and 0 deletions

View File

@ -100,6 +100,7 @@
with_items:
- { name: ceph, file: ceph.conf }
- { name: cinder, file: cinder.conf }
- { name: designate, file: designate.conf }
- { name: glance, file: glance.conf }
- { name: grafana, file: grafana.ini }
- { name: heat, file: heat.conf }
@ -199,6 +200,7 @@
# Extra free-form user-provided configuration.
kolla_extra_ceph: "{{ kolla_extra_config.ceph | default }}"
kolla_extra_cinder: "{{ kolla_extra_config.cinder | default }}"
kolla_extra_designate: "{{ kolla_extra_config.designate | default }}"
kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
kolla_extra_grafana: "{{ kolla_extra_config.grafana | default }}"
kolla_extra_heat: "{{ kolla_extra_config.heat | default }}"

View File

@ -23,6 +23,15 @@ kolla_enable_cinder:
# Free form extra configuration to append to cinder.conf.
kolla_extra_cinder:
###############################################################################
# designate configuration.
# Whether to enable designate.
kolla_enable_designate:
# Free form extra configuration to append to designate.conf.
kolla_extra_designate:
###############################################################################
# Glance configuration.

View File

@ -15,6 +15,7 @@
with_items:
- { src: ceph.conf.j2, dest: ceph.conf, enabled: "{{ kolla_enable_ceph }}" }
- { src: cinder.conf.j2, dest: cinder.conf, enabled: "{{ kolla_enable_cinder }}" }
- { src: designate.conf.j2, dest: designate.conf, enabled: "{{ kolla_enable_designate }}" }
- { src: glance.conf.j2, dest: glance.conf, enabled: "{{ kolla_enable_glance }}" }
- { src: grafana.ini.j2, dest: grafana.ini, enabled: "{{ kolla_enable_grafana }}" }
- { src: heat.conf.j2, dest: heat.conf, enabled: "{{ kolla_enable_heat }}" }

View File

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

View File

@ -19,6 +19,11 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/cinder"
patterns: "*"
enabled: "{{ kolla_enable_cinder }}"
# Designate.
- src: "{{ kolla_extra_config_path }}/designate"
dest: "{{ kolla_node_custom_config_path }}/designate"
patterns: "*"
enabled: "{{ kolla_enable_designate }}"
# Fluentd filters.
- src: "{{ kolla_extra_config_path }}//fluentd/filter"
dest: "{{ kolla_node_custom_config_path }}/fluentd/filter"