Merge "Only copy the necessary config files for Glance"

This commit is contained in:
Jenkins 2016-03-29 09:26:40 +00:00 committed by Gerrit Code Review
commit 48fcd382ec

View File

@ -1,34 +1,38 @@
--- ---
- name: Ensuring config directories exist - name: Ensuring config directories exist
file: file:
path: "{{ node_config_directory }}/{{ item }}" path: "{{ node_config_directory }}/{{ item.service }}"
state: "directory" state: "directory"
recurse: yes recurse: yes
when: inventory_hostname in groups[item.group]
with_items: with_items:
- "glance-api" - { service: glance-api, group: glance-api }
- "glance-registry" - { service: glance-registry, group: glance-registry }
- name: Copying over config.json files for services - name: Copying over config.json files for services
template: template:
src: "{{ item }}.json.j2" src: "{{ item.service }}.json.j2"
dest: "{{ node_config_directory }}/{{ item }}/config.json" dest: "{{ node_config_directory }}/{{ item.service }}/config.json"
when: inventory_hostname in groups[item.group]
with_items: with_items:
- "glance-api" - { service: glance-api, group: glance-api }
- "glance-registry" - { service: glance-registry, group: glance-registry }
- name: Copying over glance-*.conf - name: Copying over glance-*.conf
merge_configs: merge_configs:
vars: vars:
service_name: "{{ item }}" service_name: "{{ item.service }}"
sources: sources:
- "{{ role_path }}/templates/{{ item }}.conf.j2" - "{{ role_path }}/templates/{{ item.service }}.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.service }}.conf"
- "/etc/kolla/config/glance/{{ inventory_hostname }}/{{ item }}.conf" - "/etc/kolla/config/glance/{{ inventory_hostname }}/{{ item.service }}.conf"
dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf" dest: "{{ node_config_directory }}/{{ item.service }}/{{ item.service }}.conf"
when: inventory_hostname in groups[item.group]
with_items: with_items:
- "glance-api" - { service: glance-api, group: glance-api }
- "glance-registry" - { service: glance-registry, group: glance-registry }