Merge "Trove services restarting issue on conf update"

This commit is contained in:
Jenkins 2017-04-07 08:41:17 +00:00 committed by Gerrit Code Review
commit 8959e15a9e

View File

@ -26,7 +26,6 @@
service: "{{ trove_services[service_name] }}" service: "{{ trove_services[service_name] }}"
config_json: "{{ trove_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" config_json: "{{ trove_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
conf_file: "{{ trove_conf_file.results|selectattr('item.key', 'equalto', service_name)|first }}" conf_file: "{{ trove_conf_file.results|selectattr('item.key', 'equalto', service_name)|first }}"
trove_conf: "{{ trove_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
trove_conductor_container: "{{ check_trove_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" trove_conductor_container: "{{ check_trove_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
@ -40,7 +39,6 @@
- service.enabled | bool - service.enabled | bool
- config_json.changed | bool - config_json.changed | bool
or conf_file.changed | bool or conf_file.changed | bool
or trove_conf.changed | bool
or trove_conductor_container.changed | bool or trove_conductor_container.changed | bool
- name: Restart trove-taskmanager container - name: Restart trove-taskmanager container
@ -49,7 +47,6 @@
service: "{{ trove_services[service_name] }}" service: "{{ trove_services[service_name] }}"
config_json: "{{ trove_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" config_json: "{{ trove_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
conf_file: "{{ trove_conf_file.results|selectattr('item.key', 'equalto', service_name)|first }}" conf_file: "{{ trove_conf_file.results|selectattr('item.key', 'equalto', service_name)|first }}"
trove_conf: "{{ trove_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
trove_taskmanager_container: "{{ check_trove_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" trove_taskmanager_container: "{{ check_trove_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
@ -63,5 +60,4 @@
- service.enabled | bool - service.enabled | bool
- config_json.changed | bool - config_json.changed | bool
or conf_file.changed | bool or conf_file.changed | bool
or trove_conf.changed | bool
or trove_taskmanager_container.changed | bool or trove_taskmanager_container.changed | bool