openstack/kayobe
Code Issues Proposed changes

Add support for a free-form configuration directory for glance

Browse Source
This commit is contained in:
Stig Telfer 2017-09-02 22:13:14 +01:00
parent 00b6d7e7f0
commit 2e98f97207
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/kolla-openstack.yml
View File

@ -176,4 +176,5 @@
kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}"
kolla_extra_nova: "{{ kolla_extra_config.nova | default }}"
kolla_extra_sahara: "{{ kolla_extra_config.sahara | default }}"
kolla_extra_glance_path: "{{ kayobe_config_path }}/kolla/config/glance"
kolla_extra_fluentd_output_path: "{{ kayobe_config_path }}/kolla/config/fluentd/output"

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

@ -9,6 +9,7 @@
- { name: ironic, enabled: "{{ kolla_enable_ironic }}" }
- { name: neutron, enabled: "{{ kolla_enable_neutron }}" }
- { name: swift, enabled: "{{ kolla_enable_swift }}" }
- { name: glance, enabled: "{{ kolla_enable_glance }}" }
when: "{{ item.enabled | bool }}"
- name: Ensure the Kolla OpenStack configuration files exist
@ -30,6 +31,15 @@
- { src: sahara.conf.j2, dest: sahara.conf, enabled: "{{ kolla_enable_sahara }}" }
when: "{{ item.enabled | bool }}"
- name: Ensure extra glance configuration files exist
template:
src: "{{ item }}"
dest: "{{ kolla_node_custom_config_path }}/glance/{{ item | basename }}"
mode: 0640
with_fileglob:
- "{{ kolla_extra_glance_path }}/*"
when: "{{ kolla_extra_glance_path != None }}"
- name: Ensure extra fluentd output configuration files exist
template:
src: "{{ item }}"