From b257b2a676e4b75e9ec74aa5cf3ee8730b7c15bd Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Thu, 30 Mar 2017 11:26:32 +0200 Subject: [PATCH] Trove services restarting issue on conf update In case of trove-api service config file modification (trove.conf file), trove-conductor and trove-taskmanager are restarted too, but they should not. trove-conductor startup command: https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/trove/templates/trove-conductor.json.j2#L2 => trove.conf is not used trove-taskmanager startup command: https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/trove/templates/trove-taskmanager.json.j2#L2 => trove.conf is not used Change-Id: Ic4703a571cec5bf8b3f91cfcb9da1a23e2bb300b Closes-Bug: #1677531 --- ansible/roles/trove/handlers/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ansible/roles/trove/handlers/main.yml b/ansible/roles/trove/handlers/main.yml index ca6ff60310..1dd8a9d543 100644 --- a/ansible/roles/trove/handlers/main.yml +++ b/ansible/roles/trove/handlers/main.yml @@ -26,7 +26,6 @@ service: "{{ trove_services[service_name] }}" 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 }}" - 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 }}" kolla_docker: action: "recreate_or_restart_container" @@ -40,7 +39,6 @@ - service.enabled | bool - config_json.changed | bool or conf_file.changed | bool - or trove_conf.changed | bool or trove_conductor_container.changed | bool - name: Restart trove-taskmanager container @@ -49,7 +47,6 @@ service: "{{ trove_services[service_name] }}" 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 }}" - 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 }}" kolla_docker: action: "recreate_or_restart_container" @@ -63,5 +60,4 @@ - service.enabled | bool - config_json.changed | bool or conf_file.changed | bool - or trove_conf.changed | bool or trove_taskmanager_container.changed | bool