openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Only use handler on filtered services

Browse Source 
Since we create a filtered list of services we should use the handler to
only restart those services, rather than all services.

Additionally, we no longer need to check "service_en" since that will
happen when the services are filtered. We can then check if the service
exists before performing the metadata-proxy cleanup.

Change-Id: I4ca3d90123e146d09cab20a0eda627014d9717e6
Depends-On: Ic152cfb01930d8bde10ea6d9aa5bba173a87e376
This commit is contained in:
Andy McCrae 2017-04-28 16:42:25 +01:00 committed by Andy McCrae
parent bc04011168
commit 45c7e49c42
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handlers/main.yml
View File

@ -28,8 +28,7 @@
enabled: yes enabled: yes
state: "stopped" state: "stopped"
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
with_dict: "{{ neutron_services }}" with_dict: "{{ filtered_neutron_services }}"
when: item.value.service_en | bool
register: _stop register: _stop
until: _stop | success until: _stop | success
retries: 5 retries: 5
@ -53,7 +52,7 @@
fi fi
fi fi
done done
when: neutron_services['neutron-metadata-agent'].service_en | bool when: '"neutron-metadata-agent" in filtered_neutron_services'
# Note (odyssey4me): # Note (odyssey4me):
# The policy.json file is currently read continually by the services # The policy.json file is currently read continually by the services
@ -75,8 +74,7 @@
enabled: yes enabled: yes
state: "started" state: "started"
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
with_dict: "{{ neutron_services }}" with_dict: "{{ filtered_neutron_services }}"
when: item.value.service_en | bool
register: _start register: _start
until: _start | success until: _start | success
retries: 5 retries: 5