diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-03-28 12:24:23 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-03-28 12:24:23 +0800 |
| commit | 9523fd0e56f4c7b7eda87c06e27b35a97e3a02fa (patch) | |
| tree | f7b1d4d86a4687ef51e690fea94a6e4e1a5ca6a2 | |
| parent | 31a82052f213908427748421ea7777b4493fe29f (diff) | |
| download | kolla-9523fd0e56f4c7b7eda87c06e27b35a97e3a02fa.tar.gz kolla-9523fd0e56f4c7b7eda87c06e27b35a97e3a02fa.zip | |
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
| -rw-r--r-- | ansible/roles/glance/tasks/config.yml | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index 916cac84d..eb9bf1691 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 } + |