diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-29 09:27:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-29 09:27:02 +0000 |
| commit | 0523c8fc901c88179754ba7483e30b13192c217f (patch) | |
| tree | c7ac37fd3348b59f41c9f31e8bee2e9de26399db | |
| parent | 48fcd382ec1ce9a0ec917a705ac5c795ead7ad18 (diff) | |
| parent | 0a6cff4a6dbfd0f8a451cbb2fa36f01375c3ebf9 (diff) | |
| download | kolla-0523c8fc901c88179754ba7483e30b13192c217f.tar.gz kolla-0523c8fc901c88179754ba7483e30b13192c217f.zip | |
Merge "Refactor the glance service group mapping"
| -rw-r--r-- | ansible/roles/glance/defaults/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/config.yml | 13 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/do_reconfigure.yml | 18 |
3 files changed, 12 insertions, 23 deletions
diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index d8dbed8c6..3e35923e8 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/ansible/roles/glance/defaults/main.yml @@ -1,5 +1,9 @@ --- project_name: "glance" +glance_service_groups: + - { name: glance_api, service: glance-api, group: glance-api } + - { name: glance_registry, service: glance-registry, group: glance-registry } + #################### # Ceph diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index eb9bf1691..8a29534b0 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -5,18 +5,14 @@ state: "directory" recurse: yes when: inventory_hostname in groups[item.group] - with_items: - - { service: glance-api, group: glance-api } - - { service: glance-registry, group: glance-registry } + with_items: "{{ glance_service_groups }}" - name: Copying over config.json files for services template: src: "{{ item.service }}.json.j2" dest: "{{ node_config_directory }}/{{ item.service }}/config.json" when: inventory_hostname in groups[item.group] - with_items: - - { service: glance-api, group: glance-api } - - { service: glance-registry, group: glance-registry } + with_items: "{{ glance_service_groups }}" - name: Copying over glance-*.conf merge_configs: @@ -32,7 +28,4 @@ - "/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: - - { service: glance-api, group: glance-api } - - { service: glance-registry, group: glance-registry } - + with_items: "{{ glance_service_groups }}" diff --git a/ansible/roles/glance/tasks/do_reconfigure.yml b/ansible/roles/glance/tasks/do_reconfigure.yml index dc3483ae6..ae685dd0e 100644 --- a/ansible/roles/glance/tasks/do_reconfigure.yml +++ b/ansible/roles/glance/tasks/do_reconfigure.yml @@ -6,9 +6,7 @@ register: container_state failed_when: container_state.Running == false when: inventory_hostname in groups[item.group] - with_items: - - { name: glance_api, group: glance-api } - - { name: glance_registry, group: glance-registry } + with_items: "{{ glance_service_groups }}" - include: config.yml @@ -18,9 +16,7 @@ failed_when: false register: check_results when: inventory_hostname in groups[item.group] - with_items: - - { name: glance_api, group: glance-api } - - { name: glance_registry, group: glance-registry } + with_items: "{{ glance_service_groups }}" # NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS' # and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE', @@ -31,9 +27,7 @@ action: "get_container_env" register: container_envs when: inventory_hostname in groups[item.group] - with_items: - - { name: glance_api, group: glance-api } - - { name: glance_registry, group: glance-registry } + with_items: "{{ glance_service_groups }}" - name: Remove the containers kolla_docker: @@ -45,8 +39,7 @@ - item[2]['rc'] == 1 - inventory_hostname in groups[item[0]['group']] with_together: - - [{ name: glance_api, group: glance-api }, - { name: glance_registry, group: glance-registry }] + - "{{ glance_service_groups }}" - container_envs.results - check_results.results @@ -63,7 +56,6 @@ - item[2]['rc'] == 1 - inventory_hostname in groups[item[0]['group']] with_together: - - [{ name: glance_api, group: glance-api }, - { name: glance_registry, group: glance-registry }] + - "{{ glance_service_groups }}" - container_envs.results - check_results.results |