openstack/kolla
Code Issues Proposed changes

Refactor glance config tasks

Browse Source 
This now matches the way we copy confis in other services.

TrivialFix

Change-Id: Ia9c6d5f9a633c0b20b4d9a697863bd2753d39443
This commit is contained in:
SamYaple 2016-03-17 17:17:12 +00:00
parent 3c0641b36b
commit ff91d53c76
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ansible/roles/glance/tasks/config.yml
View File

@ -16,32 +16,18 @@
- "glance-api" - "glance-api"
- "glance-registry" - "glance-registry"
- name: Copying over glance-api.conf - name: Copying over glance-*.conf
merge_configs: merge_configs:
vars: vars:
service_name: "{{ item }}" service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/glance-api.conf.j2" - "{{ role_path }}/templates/{{ item }}.conf.j2"
- "/etc/kolla/config/global.conf" - "/etc/kolla/config/global.conf"
- "/etc/kolla/config/database.conf" - "/etc/kolla/config/database.conf"
- "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/glance.conf" - "/etc/kolla/config/glance.conf"
- "/etc/kolla/config/glance/{{ item }}.conf" - "/etc/kolla/config/glance/{{ item }}.conf"
dest: "{{ node_config_directory }}/{{ item }}/glance-api.conf" dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf"
with_items: with_items:
- "glance-api" - "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" - "glance-registry"