diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-29 09:26:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-29 09:26:40 +0000 |
| commit | 48fcd382ec1ce9a0ec917a705ac5c795ead7ad18 (patch) | |
| tree | 56ec67bce55a94f087a21e5d6d0a9ad9b23b7348 | |
| parent | b6b37f4cec3e4e9b442f58fa86486fa809098b0b (diff) | |
| parent | 9523fd0e56f4c7b7eda87c06e27b35a97e3a02fa (diff) | |
| download | kolla-48fcd382ec1ce9a0ec917a705ac5c795ead7ad18.tar.gz kolla-48fcd382ec1ce9a0ec917a705ac5c795ead7ad18.zip | |
Merge "Only copy the necessary config files for Glance"
| -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 } + |