openstack/kolla-ansible
Code Issues Proposed changes

Merge "Only start one glance_api when using file backend"

Browse Source
This commit is contained in:
Jenkins 2017-07-27 09:41:43 +00:00 committed by Gerrit Code Review
commit 6c144946fa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/glance/defaults/main.yml
View File

@ -75,6 +75,8 @@ glance_backends:
glance_store_backends: "{{ glance_backends|selectattr('enabled', 'equalto', true)|list }}" glance_store_backends: "{{ glance_backends|selectattr('enabled', 'equalto', true)|list }}"
glance_api_hosts: "{{ groups['glance-api']|first if glance_backend_file | bool and glance_file_datadir_volume == 'glance' else groups['glance-api'] }}"
#################### ####################
# OpenStack # OpenStack
#################### ####################

3
ansible/roles/glance/handlers/main.yml
View File

@ -15,14 +15,13 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
when: when:
- action != "config" - action != "config"
- inventory_hostname in groups[service.group] - inventory_hostname in glance_api_hosts
- service.enabled | bool - service.enabled | bool
- config_json.changed | bool - config_json.changed | bool
or glance_conf.changed | bool or glance_conf.changed | bool
or policy_json.changed | bool or policy_json.changed | bool
or glance_api_container.changed | bool or glance_api_container.changed | bool
- name: Restart glance-registry container - name: Restart glance-registry container
vars: vars:
service_name: "glance-registry" service_name: "glance-registry"