diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-18 02:29:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-18 02:29:54 +0000 |
| commit | e20f3ec7f5c16085562b7f550fae47b17e738ca5 (patch) | |
| tree | 4b5399598310e635c001dee2e9a264202d731037 /ansible | |
| parent | 14b3a7f187a25dd8f055ca792f78315abedc7928 (diff) | |
| parent | ff91d53c7634a6580f5bc67797fbb4f0a8c8d2ac (diff) | |
| download | kolla-e20f3ec7f5c16085562b7f550fae47b17e738ca5.tar.gz kolla-e20f3ec7f5c16085562b7f550fae47b17e738ca5.zip | |
Merge "Refactor glance config tasks"
Diffstat (limited to 'ansible')
| -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" |