diff options
| author | SamYaple <sam@yaple.net> | 2016-03-17 17:17:12 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-03-17 17:18:00 +0000 |
| commit | ff91d53c7634a6580f5bc67797fbb4f0a8c8d2ac (patch) | |
| tree | dbb53768ce566ba0e9c0d75cadf3cbc094c403a8 | |
| parent | 3c0641b36b3b606d2200035de0cab47a6d461fb2 (diff) | |
| download | kolla-ff91d53c7634a6580f5bc67797fbb4f0a8c8d2ac.tar.gz kolla-ff91d53c7634a6580f5bc67797fbb4f0a8c8d2ac.zip | |
Refactor glance config tasks
This now matches the way we copy confis in other services.
TrivialFix
Change-Id: Ia9c6d5f9a633c0b20b4d9a697863bd2753d39443
| -rw-r--r-- | ansible/roles/glance/tasks/config.yml | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index dccee18d3..ed8cb57b0 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -16,32 +16,18 @@ - "glance-api" - "glance-registry" -- name: Copying over glance-api.conf +- name: Copying over glance-*.conf merge_configs: vars: service_name: "{{ item }}" sources: - - "{{ role_path }}/templates/glance-api.conf.j2" + - "{{ role_path }}/templates/{{ item }}.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" - dest: "{{ node_config_directory }}/{{ item }}/glance-api.conf" + dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf" with_items: - "glance-api" - -- name: Copying over glance-registry.conf - merge_configs: - vars: - service_name: "{{ item }}" - sources: - - "{{ role_path }}/templates/glance-registry.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" - dest: "{{ node_config_directory }}/{{ item }}/glance-registry.conf" - with_items: - "glance-registry" |