From 2e98f97207904b1e8ff45c18e0cd2f90f744d312 Mon Sep 17 00:00:00 2001
From: Stig Telfer <stig@stackhpc.com>
Date: Sat, 2 Sep 2017 22:13:14 +0100
Subject: [PATCH] Add support for a free-form configuration directory for
 glance

---
 ansible/kolla-openstack.yml                    |  1 +
 ansible/roles/kolla-openstack/tasks/config.yml | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index 0b596b6a9..82cf8ad22 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -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"
diff --git a/ansible/roles/kolla-openstack/tasks/config.yml b/ansible/roles/kolla-openstack/tasks/config.yml
index fcd5c131a..b715919e0 100644
--- a/ansible/roles/kolla-openstack/tasks/config.yml
+++ b/ansible/roles/kolla-openstack/tasks/config.yml
@@ -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 }}"