From 9523fd0e56f4c7b7eda87c06e27b35a97e3a02fa Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 28 Mar 2016 12:24:23 +0800 Subject: [PATCH] Only copy the necessary config files for Glance Only copy the necessary config files when it _really_ needed. This will make the config file safer Partial-Bug: #1559122 Change-Id: I5f5df54c688fb4f6b0ee68815116e2418d5742f7 --- ansible/roles/glance/tasks/config.yml | 32 +++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index 916cac84d8..eb9bf16914 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -1,34 +1,38 @@ --- - name: Ensuring config directories exist file: - path: "{{ node_config_directory }}/{{ item }}" + path: "{{ node_config_directory }}/{{ item.service }}" state: "directory" recurse: yes + when: inventory_hostname in groups[item.group] with_items: - - "glance-api" - - "glance-registry" + - { service: glance-api, group: glance-api } + - { service: glance-registry, group: glance-registry } - name: Copying over config.json files for services template: - src: "{{ item }}.json.j2" - dest: "{{ node_config_directory }}/{{ item }}/config.json" + src: "{{ item.service }}.json.j2" + dest: "{{ node_config_directory }}/{{ item.service }}/config.json" + when: inventory_hostname in groups[item.group] with_items: - - "glance-api" - - "glance-registry" + - { service: glance-api, group: glance-api } + - { service: glance-registry, group: glance-registry } - name: Copying over glance-*.conf merge_configs: vars: - service_name: "{{ item }}" + service_name: "{{ item.service }}" sources: - - "{{ role_path }}/templates/{{ item }}.conf.j2" + - "{{ role_path }}/templates/{{ item.service }}.conf.j2" - "/etc/kolla/config/global.conf" - "/etc/kolla/config/database.conf" - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/glance.conf" - - "/etc/kolla/config/glance/{{ item }}.conf" - - "/etc/kolla/config/glance/{{ inventory_hostname }}/{{ item }}.conf" - dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf" + - "/etc/kolla/config/glance/{{ item.service }}.conf" + - "/etc/kolla/config/glance/{{ inventory_hostname }}/{{ item.service }}.conf" + dest: "{{ node_config_directory }}/{{ item.service }}/{{ item.service }}.conf" + when: inventory_hostname in groups[item.group] with_items: - - "glance-api" - - "glance-registry" + - { service: glance-api, group: glance-api } + - { service: glance-registry, group: glance-registry } +