git-harry 8a9605ba57 Fix rsync service restart in os_swift
The rsync service is currently restarted using two handlers, one to stop
the service and a second to start it. There is not a sufficient delay
between the two task and so the rsync pid has not been removed before
the attempt is made to start the service.

This commit replaces the two handlers with a single one that will do the
restart in one go.

Change-Id: I8ed4630da1add7205552b6ec731a143dbe45112b
Closes-bug: 1538649
2016-01-27 16:51:14 +00:00

71 lines
1.7 KiB
YAML

---
# Copyright 2014, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Restart swift account services
service:
name: "{{ item }}"
state: "restarted"
pattern: "{{ item }}"
register: service_restart
with_items: swift_account_program_names
failed_when: false
- name: Restart swift container services
service:
name: "{{ item }}"
state: "restarted"
pattern: "{{ item }}"
register: service_restart
with_items: swift_container_program_names
failed_when: false
- name: Restart swift object services
service:
name: "{{ item }}"
state: "restarted"
pattern: "{{ item }}"
register: service_restart
with_items: swift_object_program_names
failed_when: false
- name: Restart swift proxy services
service:
name: "{{ item }}"
state: "restarted"
pattern: "{{ item }}"
register: service_restart
with_items: swift_proxy_program_names
failed_when: false
- name: Restart service
service:
name: "{{ item }}"
state: "restarted"
pattern: "{{ item }}"
enabled: "yes"
when: item is defined
- name: Restart rsyslog
service:
name: "rsyslog"
state: "restarted"
- name: Restart rsync service
service:
name: "rsync"
state: "restarted"
enabled: "yes"
sleep: 2