From c816a9282c8f778f18249827397901e04c040019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Wed, 14 Feb 2018 01:44:18 +0100
Subject: [PATCH] container: osd remove run_once
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When used along with  delegate, run_once does not belong well. Thus,
using | last always brings the desired result.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 roles/ceph-defaults/handlers/main.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/roles/ceph-defaults/handlers/main.yml b/roles/ceph-defaults/handlers/main.yml
index 3d073ace0..b56c5d6a1 100644
--- a/roles/ceph-defaults/handlers/main.yml
+++ b/roles/ceph-defaults/handlers/main.yml
@@ -28,7 +28,6 @@
     - inventory_hostname in play_hosts
     - mon_socket_stat.rc == 0
   with_items: "{{ groups[mon_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: restart ceph mon daemon(s) - container
@@ -43,7 +42,6 @@
     - inventory_hostname in play_hosts
     - ceph_mon_container_stat.get('stdout_lines', [])|length != 0
   with_items: "{{ groups[mon_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 # This does not just restart OSDs but everything else too. Unfortunately
@@ -76,7 +74,6 @@
     # See https://github.com/ceph/ceph-ansible/issues/1457 for the condition below
     - inventory_hostname in play_hosts
   with_items: "{{ groups[osd_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: restart ceph osds daemon(s) - container
@@ -94,7 +91,6 @@
     # See https://github.com/ceph/ceph-ansible/issues/1457 for the condition below
     - inventory_hostname in play_hosts
   with_items: "{{ groups[osd_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: copy mds restart script
@@ -120,7 +116,6 @@
     - inventory_hostname in play_hosts
     - mds_socket_stat.rc == 0
   with_items: "{{ groups[mds_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: restart ceph mds daemon(s) - container
@@ -135,7 +130,6 @@
     - inventory_hostname in play_hosts
     - ceph_mds_container_stat.get('stdout_lines', [])|length != 0
   with_items: "{{ groups[mds_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: copy rgw restart script
@@ -161,7 +155,6 @@
     - inventory_hostname in play_hosts
     - rgw_socket_stat.rc == 0
   with_items: "{{ groups[rgw_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: restart ceph rgw daemon(s) - container
@@ -176,7 +169,6 @@
     - inventory_hostname in play_hosts
     - ceph_rgw_container_stat.get('stdout_lines', [])|length != 0
   with_items: "{{ groups[rgw_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: copy nfs restart script
@@ -202,7 +194,6 @@
     - inventory_hostname in play_hosts
     - nfs_socket_stat.rc == 0
   with_items: "{{ groups[nfs_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: restart ceph nfs daemon(s) - container
@@ -217,7 +208,6 @@
     - inventory_hostname in play_hosts
     - ceph_nfs_container_stat.get('stdout_lines', [])|length != 0
   with_items: "{{ groups[nfs_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: copy rbd mirror restart script
@@ -243,7 +233,6 @@
     - inventory_hostname in play_hosts
     - rbd_mirror_socket_stat.rc == 0
   with_items: "{{ groups[rbdmirror_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: restart ceph rbd mirror daemon(s) - container
@@ -258,7 +247,6 @@
     - inventory_hostname in play_hosts
     - ceph_rbd_mirror_container_stat.get('stdout_lines', [])|length != 0
   with_items: "{{ groups[rbdmirror_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: copy mgr restart script
@@ -284,7 +272,6 @@
     - inventory_hostname in play_hosts
     - mgr_socket_stat.rc == 0
   with_items: "{{ groups[mgr_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"
 
 - name: restart ceph mgr daemon(s) - container
@@ -299,5 +286,4 @@
     - inventory_hostname in play_hosts
     - ceph_mgr_container_stat.get('stdout_lines', [])|length != 0
   with_items: "{{ groups[mgr_group_name] }}"
-  run_once: true
   delegate_to: "{{ item }}"