Avoid deprecated always_run

The `always_run` key is deprecated and being removed in Ansible 2.4.
Using it causes a warning to be displayed:

    [DEPRECATION WARNING]: always_run is deprecated.

This patch changes all instances of `always_run` to use the `always`
tag, which causes the task to run each time the playbook runs.

diff --git a/roles/ceph-common-coreos/tasks/main.yml b/roles/ceph-common-coreos/tasks/main.yml
index f858ae5fd9bdcca4d147daf745dfab07fb28322a..249a186fed991f67c66622d950322a5c08ebef37 100644 (file)
--- a/roles/ceph-common-coreos/tasks/main.yml
+++ b/roles/ceph-common-coreos/tasks/main.yml
@@ -3,7 +3,8 @@
   raw: stat $HOME/.python
   register: need_python
   ignore_errors: true
-  always_run: true
+  tags:
+    - always
 
 - include: install_pypy.yml
   when: need_python | failed
@@ -12,7 +13,8 @@
   raw: stat $HOME/.pip
   register: need_pip
   ignore_errors: true
-  always_run: true
+  tags:
+    - always
 
 - include: install_pip.yml
   when: need_pip | failed and need_python | failed

diff --git a/roles/ceph-common/tasks/checks/check_firewall.yml b/roles/ceph-common/tasks/checks/check_firewall.yml
index 458da0711591a234b3a5cb2c0198b9c6af7253da..75378fea3ec9c5cda02674c44b9dde45e15632c5 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_firewall.yml
+++ b/roles/ceph-common/tasks/checks/check_firewall.yml
@@ -5,7 +5,8 @@
   failed_when: false
   register: nmapexist
   run_once: true
-  always_run: true
+  tags:
+    - always
 
 - name: inform that nmap is not present
   debug:
@@ -19,10 +20,11 @@
   changed_when: false
   failed_when: false
   register: monportstate
-  always_run: true
   when:
     - mon_group_name in group_names
     - nmapexist.rc == 0
+  tags:
+    - always
 
 - name: fail if monitor port is filtered
   fail:
@@ -37,10 +39,11 @@
   changed_when: false
   failed_when: false
   register: osdrangestate
-  always_run: true
   when:
     - osd_group_name in group_names
     - nmapexist.rc == 0
+  tags:
+    - always
 
 - name: fail if osd and mds range is filtered (osd hosts)
   fail:
@@ -55,10 +58,11 @@
   changed_when: false
   failed_when: false
   register: mdsrangestate
-  always_run: true
   when:
     - mds_group_name in group_names
     - nmapexist.rc == 0
+  tags:
+    - always
 
 - name: fail if osd and mds range is filtered (mds hosts)
   fail:
@@ -73,10 +77,11 @@
   changed_when: false
   failed_when: false
   register: rgwportstate
-  always_run: true
   when:
     - rgw_group_name in group_names
     - nmapexist.rc == 0
+  tags:
+    - always
 
 - name: fail if rados gateway port is filtered
   fail:
@@ -91,10 +96,11 @@
   changed_when: false
   failed_when: false
   register: nfsportstate
-  always_run: true
   when:
     - nfs_group_name in group_names
     - nmapexist.rc == 0
+  tags:
+    - always
 
 - name: fail if NFS ports are filtered
   fail:

diff --git a/roles/ceph-common/tasks/checks/check_ntp_atomic.yml b/roles/ceph-common/tasks/checks/check_ntp_atomic.yml
index 32050835e02235e7e04464a72f2cb24859cada13..3fe88bcdcf02dea843001cc34818358a001e9afa 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_atomic.yml
+++ b/roles/ceph-common/tasks/checks/check_ntp_atomic.yml
@@ -3,5 +3,6 @@
   command: rpm -q chrony
   register: ntp_pkg_query
   ignore_errors: true
-  always_run: true
   changed_when: false
+  tags:
+    - always

diff --git a/roles/ceph-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-common/tasks/checks/check_ntp_debian.yml
index c666958ca5926a8534719c863e81a51915e3124c..1d537825ba64db7df9638b081fea59b18d14d2a1 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_debian.yml
+++ b/roles/ceph-common/tasks/checks/check_ntp_debian.yml
@@ -3,10 +3,11 @@
   command: dpkg -s ntp
   register: ntp_pkg_query
   ignore_errors: true
-  always_run: true
   changed_when: false
   when:
     - ansible_os_family == 'Debian'
+  tags:
+    - always
 
 - name: install ntp on debian
   package:

diff --git a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
index 2a957b4553a87dd8da66fc896ac372295e7251e2..c3ab43be26f5dcf8a3689d3febacfcba8dc0aaea 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
+++ b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
@@ -3,10 +3,11 @@
   command: rpm -q ntp
   register: ntp_pkg_query
   ignore_errors: true
-  always_run: true
   changed_when: false
   when:
     - ansible_os_family == 'RedHat'
+  tags:
+    - always
 
 - name: install ntp on redhat
   package:

diff --git a/roles/ceph-common/tasks/checks/check_system.yml b/roles/ceph-common/tasks/checks/check_system.yml
index 4e0be38cd92e2718b66107f1d1b80d57aebf38ee..6d31d12772dce2c467002e3465979d361e199f9c 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_system.yml
+++ b/roles/ceph-common/tasks/checks/check_system.yml
@@ -30,11 +30,12 @@
   register: subscription
   changed_when: false
   failed_when: false
-  always_run: true
   when:
     - ansible_distribution == 'Red Hat Enterprise Linux'
     - ceph_repository == 'rhcs'
     - ceph_repository_type == 'cdn'
+  tags:
+    - always
 
 - name: fail on unregistered red hat rhcs linux
   fail:

diff --git a/roles/ceph-common/tasks/configure_cluster_name.yml b/roles/ceph-common/tasks/configure_cluster_name.yml
index 373a87effa7af94f8adb3583367fbf896cd04fda..318746d9875856fa06066a18343eeb87fa5717af 100644 (file)
--- a/roles/ceph-common/tasks/configure_cluster_name.yml
+++ b/roles/ceph-common/tasks/configure_cluster_name.yml
@@ -22,9 +22,10 @@
   stat:
     path: /etc/default/ceph
   register: etc_default_ceph
-  always_run: true
   when:
     - ansible_os_family == "Debian"
+  tags:
+    - always
 
 - name: configure cluster name
   lineinfile:

diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
index 1b22afda4fccf853a0cf747efcb967c133910ad2..b22cf4e172078a8d28ed81add7502799b90059ca 100644 (file)
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -4,9 +4,10 @@
   changed_when: false
   failed_when: false
   register: rhcs_mon_repo
-  always_run: true
   when:
     - mon_group_name in group_names
+  tags:
+    - always
 
 - name: enable red hat storage monitor repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms
@@ -20,9 +21,10 @@
   changed_when: false
   failed_when: false
   register: rhcs_osd_repo
-  always_run: true
   when:
     - osd_group_name in group_names
+  tags:
+    - always
 
 - name: enable red hat storage osd repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms
@@ -36,9 +38,10 @@
   changed_when: false
   failed_when: false
   register: rhcs_rgw_mds_nfs_repo
-  always_run: true
   when:
     - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names)
+  tags:
+    - always
 
 - name: enable red hat storage rados gateway / mds repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 7658530471e3c64ee131b2a49ddde46214613606..535e13eb6b58ef303ee9ce3d5e4d8715d0dcf1b0 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -65,8 +65,9 @@
 - name: get ceph version
   command: ceph --version
   changed_when: false
-  always_run: yes
   register: ceph_version
+  tags:
+    - always
 
 - name: set_fact ceph_version
   set_fact:

diff --git a/roles/ceph-common/tasks/misc/system_tuning.yml b/roles/ceph-common/tasks/misc/system_tuning.yml
index 0aeced9ffc3343e65d95428afc607af01e513aee..901d679108039f06916d935c219ba3253cbcb411 100644 (file)
--- a/roles/ceph-common/tasks/misc/system_tuning.yml
+++ b/roles/ceph-common/tasks/misc/system_tuning.yml
@@ -33,8 +33,9 @@
   command: sysctl -b vm.min_free_kbytes
   changed_when: false
   failed_when: false
-  always_run: yes
   register: default_vm_min_free_kbytes
+  tags:
+    - always
 
 - name: set_fact vm_min_free_kbytes
   set_fact:

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index 4a5df3350330cc626a7c7fbefe6c5f0459f570a2..d256e1eba14b564fda10df6910a43878ad3ac122 100644 (file)
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -87,10 +87,11 @@
       removes="{{ fetch_directory }}/ceph_cluster_uuid.conf"
     changed_when: false
     register: cluster_uuid
-    always_run: true
     become: false
     when:
       - generate_fsid
+    tags:
+      - always
 
   - name: ensure /etc/ceph exists
     file:

diff --git a/roles/ceph-defaults/tasks/check_socket_container.yml b/roles/ceph-defaults/tasks/check_socket_container.yml
index 856a4192cc80387d3875ffbeda170dbf5513bcda..4268c22fb0120a244d40ce739dc79d69150576cf 100644 (file)
--- a/roles/ceph-defaults/tasks/check_socket_container.yml
+++ b/roles/ceph-defaults/tasks/check_socket_container.yml
@@ -4,60 +4,67 @@
   register: ceph_mon_container_stat
   changed_when: false
   failed_when: false
-  always_run: true
   when:
     - inventory_hostname in groups.get(mon_group_name, [])
+  tags:
+    - always
 
 - name: check for an osd container
   command: "docker ps -q --filter='name=ceph-osd-{{ ansible_hostname }}'"
   register: ceph_osd_container_stat
   changed_when: false
   failed_when: false
-  always_run: true
   when:
     - inventory_hostname in groups.get(osd_group_name, [])
+  tags:
+    - always
 
 - name: check for a mds container
   command: "docker ps -q --filter='name=ceph-mds-{{ ansible_hostname }}'"
   register: ceph_mds_container_stat
   changed_when: false
   failed_when: false
-  always_run: true
   when:
     - inventory_hostname in groups.get(mds_group_name, [])
+  tags:
+    - always
 
 - name: check for a rgw container
   command: "docker ps -q --filter='name=ceph-rgw-{{ ansible_hostname }}'"
   register: ceph_rgw_container_stat
   changed_when: false
   failed_when: false
-  always_run: true
   when:
     - inventory_hostname in groups.get(rgw_group_name, [])
+  tags:
+    - always
 
 - name: check for a mgr container
   command: "docker ps -q --filter='name=ceph-mgr-{{ ansible_hostname }}'"
   register: ceph_mgr_container_stat
   changed_when: false
   failed_when: false
-  always_run: true
   when:
     - inventory_hostname in groups.get(mgr_group_name, [])
+  tags:
+    - always
 
 - name: check for a rbd mirror container
   command: "docker ps -q --filter='name=ceph-rbd-mirror-{{ ansible_hostname }}'"
   register: ceph_rbd_mirror_container_stat
   changed_when: false
   failed_when: false
-  always_run: true
   when:
     - inventory_hostname in groups.get(rbdmirror_group_name, [])
+  tags:
+    - always
 
 - name: check for a nfs container
   command: "docker ps -q --filter='name=ceph-nfs-{{ ansible_hostname }}'"
   register: ceph_nfs_container_stat
   changed_when: false
   failed_when: false
-  always_run: true
   when:
     - inventory_hostname in groups.get(nfs_group_name, [])
+  tags:
+    - always

diff --git a/roles/ceph-defaults/tasks/check_socket_non_container.yml b/roles/ceph-defaults/tasks/check_socket_non_container.yml
index 4ad560ad0be4b7d42fe7a2e2679816f931956912..d93125dd39fb23397ef4bd856b468fc856ca36a1 100644 (file)
--- a/roles/ceph-defaults/tasks/check_socket_non_container.yml
+++ b/roles/ceph-defaults/tasks/check_socket_non_container.yml
@@ -3,20 +3,22 @@
   shell: stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mon*.asok
   changed_when: false
   failed_when: false
-  always_run: true
   register: mon_socket_stat
   when:
     - inventory_hostname in groups.get(mon_group_name, [])
+  tags:
+    - always
 
 - name: check if the ceph mon socket is in-use
   command: fuser --silent {{ mon_socket_stat.stdout }}
   changed_when: false
   failed_when: false
-  always_run: true
   register: mon_socket
   when:
     - inventory_hostname in groups.get(mon_group_name, [])
     - mon_socket_stat.rc == 0
+  tags:
+    - always
 
 - name: remove ceph mon socket if exists and not used by a process
   file:
@@ -32,20 +34,22 @@
     stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-osd*.asok
   changed_when: false
   failed_when: false
-  always_run: true
   register: osd_socket_stat
   when:
     - inventory_hostname in groups.get(osd_group_name, [])
+  tags:
+    - always
 
 - name: check if the ceph osd socket is in-use
   command: fuser --silent {{ osd_socket_stat.stdout }}
   changed_when: false
   failed_when: false
-  always_run: true
   register: osd_socket
   when:
     - inventory_hostname in groups.get(osd_group_name, [])
     - osd_socket_stat.rc == 0
+  tags:
+    - always
 
 - name: remove ceph osd socket if exists and not used by a process
   file:
@@ -61,20 +65,22 @@
     stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mds*.asok
   changed_when: false
   failed_when: false
-  always_run: true
   register: mds_socket_stat
   when:
     - inventory_hostname in groups.get(mds_group_name, [])
+  tags:
+    - always
 
 - name: check if the ceph mds socket is in-use
   command: fuser --silent {{ mds_socket_stat.stdout }}
   changed_when: false
   failed_when: false
-  always_run: true
   register: mds_socket
   when:
     - inventory_hostname in groups.get(mds_group_name, [])
     - mds_socket_stat.rc == 0
+  tags:
+    - always
 
 - name: remove ceph mds socket if exists and not used by a process
   file:
@@ -90,20 +96,22 @@
     stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-client.rgw*.asok
   changed_when: false
   failed_when: false
-  always_run: true
   register: rgw_socket_stat
   when:
     - inventory_hostname in groups.get(rgw_group_name, [])
+  tags:
+    - always
 
 - name: check if the ceph rgw socket is in-use
   command: fuser --silent {{ rgw_socket_stat.stdout }}
   changed_when: false
   failed_when: false
-  always_run: true
   register: rgw_socket
   when:
     - inventory_hostname in groups.get(rgw_group_name, [])
     - rgw_socket_stat.rc == 0
+  tags:
+    - always
 
 - name: remove ceph rgw socket if exists and not used by a process
   file:
@@ -119,20 +127,22 @@
     stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mgr*.asok
   changed_when: false
   failed_when: false
-  always_run: true
   register: mgr_socket_stat
   when:
     - inventory_hostname in groups.get(mgr_group_name, [])
+  tags:
+    - always
 
 - name: check if the ceph mgr socket is in-use
   command: fuser --silent {{ mgr_socket_stat.stdout }}
   changed_when: false
   failed_when: false
-  always_run: true
   register: mgr_socket
   when:
     - inventory_hostname in groups.get(mgr_group_name, [])
     - mgr_socket_stat.rc == 0
+  tags:
+    - always
 
 - name: remove ceph mgr socket if exists and not used by a process
   file:
@@ -148,20 +158,22 @@
     stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-client.rbd-mirror*.asok
   changed_when: false
   failed_when: false
-  always_run: true
   register: rbd_mirror_socket_stat
   when:
     - inventory_hostname in groups.get(rbdmirror_group_name, [])
+  tags:
+    - always
 
 - name: check if the ceph rbd mirror socket is in-use
   command: fuser --silent {{ rbd_mirror_socket_stat.stdout }}
   changed_when: false
   failed_when: false
-  always_run: true
   register: rbd_mirror_socket
   when:
     - inventory_hostname in groups.get(rbdmirror_group_name, [])
     - rbd_mirror_socket_stat.rc == 0
+  tags:
+    - always
 
 - name: remove ceph rbd mirror socket if exists and not used by a process
   file:
@@ -176,20 +188,22 @@
   command: stat --printf=%n /var/run/ganesha.pid
   changed_when: false
   failed_when: false
-  always_run: true
   register: nfs_socket_stat
   when:
     - inventory_hostname in groups.get(nfs_group_name, [])
+  tags:
+    - always
 
 - name: check if the ceph nfs ganesha socket is in-use
   command: fuser --silent {{ nfs_socket_stat.stdout }}
   changed_when: false
   failed_when: false
-  always_run: true
   register: nfs_socket
   when:
     - inventory_hostname in groups.get(nfs_group_name, [])
     - nfs_socket_stat.rc == 0
+  tags:
+    - always
 
 - name: remove ceph nfs ganesha socket if exists and not used by a process
   file:

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 3311f9e5b2a5e522786be862867988f3732e6f7e..98ad207063c7b0ada46e28f22f7dbd34c640d1a2 100644 (file)
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -18,12 +18,13 @@
   command: "{{ docker_exec_cmd }} ceph --connect-timeout 3 --cluster {{ cluster }} fsid"
   changed_when: false
   failed_when: false
-  always_run: yes
   register: ceph_current_fsid
   delegate_to: "{{ groups[mon_group_name][0] }}"
   when:
     - not rolling_update
     - groups.get(mon_group_name, []) | length > 0
+  tags:
+    - always
 
 # We want this check to be run only on the first node
 - name: check if {{ fetch_directory }} directory exists
@@ -82,9 +83,10 @@
   changed_when: false
   register: cluster_uuid
   become: false
-  always_run: true
   when:
     - generate_fsid
+  tags:
+    - always
 
 - name: set_fact fsid
   set_fact:

diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
index 32050835e02235e7e04464a72f2cb24859cada13..3fe88bcdcf02dea843001cc34818358a001e9afa 100644 (file)
--- a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
+++ b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
@@ -3,5 +3,6 @@
   command: rpm -q chrony
   register: ntp_pkg_query
   ignore_errors: true
-  always_run: true
   changed_when: false
+  tags:
+    - always

diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml
index c666958ca5926a8534719c863e81a51915e3124c..1d537825ba64db7df9638b081fea59b18d14d2a1 100644 (file)
--- a/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml
+++ b/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml
@@ -3,10 +3,11 @@
   command: dpkg -s ntp
   register: ntp_pkg_query
   ignore_errors: true
-  always_run: true
   changed_when: false
   when:
     - ansible_os_family == 'Debian'
+  tags:
+    - always
 
 - name: install ntp on debian
   package:

diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml
index 2a957b4553a87dd8da66fc896ac372295e7251e2..c3ab43be26f5dcf8a3689d3febacfcba8dc0aaea 100644 (file)
--- a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml
+++ b/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml
@@ -3,10 +3,11 @@
   command: rpm -q ntp
   register: ntp_pkg_query
   ignore_errors: true
-  always_run: true
   changed_when: false
   when:
     - ansible_os_family == 'RedHat'
+  tags:
+    - always
 
 - name: install ntp on redhat
   package:

diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml
index 81e95704b0ab3d17bdfa58483b357dee609f5d3b..48fc3a56c3141fa8f6cd836aa54013e613d9cd39 100644 (file)
--- a/roles/ceph-docker-common/tasks/main.yml
+++ b/roles/ceph-docker-common/tasks/main.yml
@@ -6,7 +6,8 @@
   stat:
     path: /run/ostree-booted
   register: stat_ostree
-  always_run: true
+  tags:
+    - always
 
 - name: set_fact is_atomic
   set_fact:
@@ -33,8 +34,9 @@
 - name: get docker version
   command: docker --version
   changed_when: false
-  always_run: yes
   register: docker_version
+  tags:
+    - always
 
 - name: set_fact docker_version docker_version.stdout.split
   set_fact:
@@ -51,7 +53,8 @@
   register: ceph_health
   changed_when: false
   failed_when: false
-  always_run: true
+  tags:
+    - always
 
 - name: include checks.yml
   include: checks.yml
@@ -89,8 +92,9 @@
 - name: get ceph version
   command: docker run --entrypoint /usr/bin/ceph {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} --version
   changed_when: false
-  always_run: yes
   register: ceph_version
+  tags:
+    - always
 
 - name: set_fact ceph_version ceph_version.stdout.split
   set_fact:

diff --git a/roles/ceph-docker-common/tasks/selinux.yml b/roles/ceph-docker-common/tasks/selinux.yml
index 8e74a6375c0fb61e92030f4d868dbbfb90d9f4d0..08651804b294d3ab4cb2932ee11564513daad132 100644 (file)
--- a/roles/ceph-docker-common/tasks/selinux.yml
+++ b/roles/ceph-docker-common/tasks/selinux.yml
@@ -3,4 +3,5 @@
   command: getenforce
   register: sestatus
   changed_when: false
-  always_run: true
+  tags:
+    - always

diff --git a/roles/ceph-docker-common/tasks/stat_ceph_files.yml b/roles/ceph-docker-common/tasks/stat_ceph_files.yml
index ffd50b57ff19a6995ea529d50b41a9d83fa47341..ba4fd5ac03babd72b9822fa2c77fb43f8d3ac70c 100644 (file)
--- a/roles/ceph-docker-common/tasks/stat_ceph_files.yml
+++ b/roles/ceph-docker-common/tasks/stat_ceph_files.yml
@@ -34,5 +34,6 @@
   become: false
   failed_when: false
   register: statconfig
-  always_run: true
+  tags:
+    - always
 

diff --git a/roles/ceph-fetch-keys/tasks/main.yml b/roles/ceph-fetch-keys/tasks/main.yml
index 917c42b2c8e2ad1364d147d27975d284a4486633..7ff09ef9adfe86e5889f3e995cbf58eeb2ad4dc1 100644 (file)
--- a/roles/ceph-fetch-keys/tasks/main.yml
+++ b/roles/ceph-fetch-keys/tasks/main.yml
@@ -3,7 +3,8 @@
   shell: ls -1 /etc/ceph/*.keyring
   changed_when: false
   register: ceph_keys
-  always_run: true
+  tags:
+    - always
 
 - name: set keys permissions
   file:

diff --git a/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml b/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml
index c4df5830f79de95d2d02f3a66f836236b43a0f5b..d8b8dd2b65753ef5275c8dd93cea01d3be6a3f5e 100644 (file)
--- a/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml
+++ b/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml
@@ -12,8 +12,9 @@
   with_items: "{{ crt_files }}"
   changed_when: false
   failed_when: false
-  always_run: true
   register: crt_files_exist
+  tags:
+    - always
 
 - name: try to fetch crt file(s)
   copy:

diff --git a/roles/ceph-mds/tasks/containerized.yml b/roles/ceph-mds/tasks/containerized.yml
index ead7d18fdbe2190eafbfbdde0236de7c49dc87e1..9057ae2fca9479f96226a58668a10f001404f201 100644 (file)
--- a/roles/ceph-mds/tasks/containerized.yml
+++ b/roles/ceph-mds/tasks/containerized.yml
@@ -14,8 +14,9 @@
   changed_when: false
   become: false
   failed_when: false
-  always_run: true
   register: statconfig
+  tags:
+    - always
 
 - name: try to fetch ceph config and keys
   copy:

diff --git a/roles/ceph-mgr/tasks/docker/copy_configs.yml b/roles/ceph-mgr/tasks/docker/copy_configs.yml
index d90ce76719dec57e15b670e3e6d486108618549f..eedbff6825463784872df924ddf1c9c4966e2695 100644 (file)
--- a/roles/ceph-mgr/tasks/docker/copy_configs.yml
+++ b/roles/ceph-mgr/tasks/docker/copy_configs.yml
@@ -11,8 +11,9 @@
   changed_when: false
   become: false
   failed_when: false
-  always_run: true
   register: statconfig
+  tags:
+    - always
 
 - name: try to fetch ceph config and keys
   copy:
@@ -30,9 +31,10 @@
 - name: "copy mgr key to /var/lib/ceph/mgr/{{ cluster }}-{{ ansible_hostname }}/keyring"
   command: cp /etc/ceph/{{ cluster }}.mgr.{{ ansible_hostname }}.keyring /var/lib/ceph/mgr/{{ cluster }}-{{ ansible_hostname }}/keyring
   changed_when: false
-  always_run: true
   with_items: "{{ statconfig.results }}"
   when: item.stat.exists == true
+  tags:
+    - always
 
 - name: set ceph mgr key permission
   file:

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index c778a27fa85a965f401fa5812abec7da5b06f17a..1a6c35d717d1ecac89a9fc9dd21fc737ba3b81b1 100644 (file)
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -4,18 +4,20 @@
   args:
     creates: /etc/ceph/{{ cluster }}.client.admin.keyring
   changed_when: false
-  always_run: true
   when:
     - cephx
     - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
+  tags:
+    - always
 
 - name: collect admin and bootstrap keys
   command: ceph-create-keys --cluster {{ cluster }} -i {{ monitor_name }}
   changed_when: false
-  always_run: true
   when:
     - cephx
     - ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous
+  tags:
+    - always
 
 # NOTE (leseb): wait for mon discovery and quorum resolution
 # the admin key is not instantaneously created so we have to wait a bit
@@ -42,19 +44,21 @@
   command: ceph --cluster {{ cluster }} config-key get initial_mon_keyring
   changed_when: false
   ignore_errors: true
-  always_run: true
   run_once: true
   failed_when: false
   register: is_initial_mon_keyring_in_kv
+  tags:
+    - always
 
 - name: put initial mon keyring in mon kv store
   command: ceph --cluster {{ cluster }} config-key put initial_mon_keyring {{ monitor_keyring.stdout }}
   changed_when: false
-  always_run: true
   run_once: true
   when:
     - is_initial_mon_keyring_in_kv.rc != 0
     - cephx
+  tags:
+    - always
 
 - name: create ceph rest api keyring when mon is not containerized
   command: ceph --cluster {{ cluster }} auth get-or-create client.restapi osd 'allow *' mon 'allow *' -o /etc/ceph/{{ cluster }}.client.restapi.keyring
@@ -87,9 +91,10 @@
   shell: ls -1 /etc/ceph/*.keyring
   changed_when: false
   register: ceph_keys
-  always_run: true
   when:
     - cephx
+  tags:
+    - always
 
 - name: set keys permissions
   file:

diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
index c4706e37e5a262892bb5f6369e576f7d743f318e..175bd90842742140881832afb7289b11c58dc199 100644 (file)
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -12,8 +12,9 @@
   changed_when: false
   register: monitor_keyring
   become: false
-  always_run: true
   when: cephx
+  tags:
+    - always
 
 - name: create monitor initial keyring
   command: ceph-authtool /var/lib/ceph/tmp/keyring.mon.{{ monitor_name }} --create-keyring --name=mon. --add-key={{ monitor_secret }} --cap mon 'allow *'

diff --git a/roles/ceph-mon/tasks/docker/copy_configs.yml b/roles/ceph-mon/tasks/docker/copy_configs.yml
index dad616f6120ba861f5745763356820dd2008f4a6..e3f6c601483bae23761862f9a472048fc9a88534 100644 (file)
--- a/roles/ceph-mon/tasks/docker/copy_configs.yml
+++ b/roles/ceph-mon/tasks/docker/copy_configs.yml
@@ -47,7 +47,8 @@
   become: false
   failed_when: false
   register: statconfig
-  always_run: true
+  tags:
+    - always
 
 - name: try to copy ceph config and keys
   copy:

diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 08162560377e2a00aae599b39a72e51c562c9686..9a3b1fe26127cf171f9c8d78402b38989605f504 100644 (file)
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -110,9 +110,10 @@
     become: false
     failed_when: false
     register: stat_mgr_keys
-    always_run: true
     when:
       - "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+    tags:
+      - always
 
   - name: fetch ceph mgr key(s)
     fetch:

diff --git a/roles/ceph-mon/tasks/secure_cluster.yml b/roles/ceph-mon/tasks/secure_cluster.yml
index 893c98ab631c77af2220a5f2e15be56fb12adf57..e0dfbb9f64f30d36b0f93b2fd7ab4119fb4f064c 100644 (file)
--- a/roles/ceph-mon/tasks/secure_cluster.yml
+++ b/roles/ceph-mon/tasks/secure_cluster.yml
@@ -2,7 +2,8 @@
 - name: collect all the pools
   command: rados --cluster {{ cluster }} lspools
   register: ceph_pools
-  always_run: true
+  tags:
+    - always
 
 - name: secure the cluster
   command: ceph --cluster {{ cluster }} osd pool set {{ item[0] }} {{ item[1] }} true

diff --git a/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml b/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml
index 0aa3c66edc0fc2c72f71d19008bb747097fc3424..04da5c82e11e1ee1a0e5a31fae36dc1c456aea26 100644 (file)
--- a/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml
+++ b/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml
@@ -4,7 +4,8 @@
   register: selinuxstatus
   changed_when: false
   failed_when: false
-  always_run: true
+  tags:
+    - always
 
 - name: install policycoreutils-python to get semanage
   package:

diff --git a/roles/ceph-nfs/tasks/pre_requisite_container.yml b/roles/ceph-nfs/tasks/pre_requisite_container.yml
index 142b9a38b941e5bfd527eeeab3e20e39a31f8868..bde0882d9d2249bbe0b08519ef6f6d13a3ccd542 100644 (file)
--- a/roles/ceph-nfs/tasks/pre_requisite_container.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite_container.yml
@@ -10,8 +10,9 @@
   changed_when: false
   become: false
   failed_when: false
-  always_run: true
   register: statconfig
+  tags:
+    - always
 
 - name: try to fetch config and keys
   copy:

diff --git a/roles/ceph-osd/tasks/check_devices.yml b/roles/ceph-osd/tasks/check_devices.yml
index d4aaaa3382add34c6061a5d5d97371658df383fd..72f38b15836487f04067ff1b71d85e78127a12bf 100644 (file)
--- a/roles/ceph-osd/tasks/check_devices.yml
+++ b/roles/ceph-osd/tasks/check_devices.yml
@@ -42,10 +42,11 @@
     - "{{ dedicated_devices|unique }}"
   changed_when: false
   failed_when: false
-  always_run: true
   register: journal_partition_status
   when:
     - osd_scenario == 'non-collocated'
+  tags:
+    - always
 
 - name: fix partitions gpt header or labels of the journal device(s)
   shell: "sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }}"

diff --git a/roles/ceph-osd/tasks/check_devices_static.yml b/roles/ceph-osd/tasks/check_devices_static.yml
index 3a4ca79349d7cb4b8dfb6946815ae18944b76f95..060528b2069e86923af8298b60f89cefea21bbb5 100644 (file)
--- a/roles/ceph-osd/tasks/check_devices_static.yml
+++ b/roles/ceph-osd/tasks/check_devices_static.yml
@@ -5,8 +5,9 @@
     - "{{ devices }}"
   changed_when: false
   failed_when: false
-  always_run: true
   register: osd_partition_status_results
+  tags:
+    - always
 
 # NOTE: The following calls to sgdisk are retried because sgdisk is known to
 # fully wipe a device the first time around. There is no need to halt execution

diff --git a/roles/ceph-osd/tasks/copy_configs.yml b/roles/ceph-osd/tasks/copy_configs.yml
index 616e6d28c34194b6e427a096c7fdd49422e2285c..ec53866d212251d22053d7a930547bab40516ba5 100644 (file)
--- a/roles/ceph-osd/tasks/copy_configs.yml
+++ b/roles/ceph-osd/tasks/copy_configs.yml
@@ -15,8 +15,9 @@
   changed_when: false
   become: false
   failed_when: false
-  always_run: true
   register: statconfig
+  tags:
+    - always
 
 - name: try to copy ceph config and keys
   copy:

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index e54a27871b414749b1f0fc6ebdef2f738e95b2ee..afc42af992c663c70242643b9330e31b6ae5e9ae 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -40,8 +40,9 @@
     - "{{ devices }}"
   changed_when: false
   failed_when: false
-  always_run: true
   register: parted_results
+  tags:
+    - always
 
 - name: include copy_configs.yml
   include: copy_configs.yml

diff --git a/roles/ceph-osd/tasks/osd_fragment.yml b/roles/ceph-osd/tasks/osd_fragment.yml
index f7e71d6cc6770b86ff25e490e0fe7956c12ddf58..df60e815c872bce7ec26d19d9cd3dd2a614f50f3 100644 (file)
--- a/roles/ceph-osd/tasks/osd_fragment.yml
+++ b/roles/ceph-osd/tasks/osd_fragment.yml
@@ -4,16 +4,18 @@
   with_items: "{{ devices }}"
   changed_when: false
   failed_when: false
-  always_run: true
   register: osd_path
+  tags:
+    - always
 
 - name: get osd id
   command: cat {{ item.stdout }}/whoami
   with_items: "{{ osd_path.results }}"
   changed_when: false
   failed_when: false
-  always_run: true
   register: osd_id_non_dir_scenario
+  tags:
+    - always
 
 # NOTE (leseb): we must do this because of
 # https://github.com/ansible/ansible/issues/4297

diff --git a/roles/ceph-osd/tasks/start_osds.yml b/roles/ceph-osd/tasks/start_osds.yml
index da140bd07f4ec1ee2ff6ea0524702486d1ce7098..5419d1d370c711fed6cb2b5359e2be403dc7c07f 100644 (file)
--- a/roles/ceph-osd/tasks/start_osds.yml
+++ b/roles/ceph-osd/tasks/start_osds.yml
@@ -4,10 +4,11 @@
     ls /var/lib/ceph/osd/ | sed 's/.*-//'
   changed_when: false
   failed_when: false
-  always_run: true
   register: osd_id
   until: osd_id.stdout_lines|length == devices|unique|length
   retries: 10
+  tags:
+    - always
 
 - name: ensure systemd service override directory exists
   file:

diff --git a/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml b/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml
index 581087db3a3ceff979b6cc662789bb329dc87eba..5c7944591658a05ab782770e1e1c0ae4f97292de 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml
+++ b/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml
@@ -17,9 +17,10 @@
   changed_when: false
   become: false
   failed_when: false
-  always_run: true
   register: statconfig
   when: "item | length > 0"
+  tags:
+    - always
 
 - name: try to fetch ceph config and keys
   copy:

diff --git a/roles/ceph-restapi/tasks/docker/copy_configs.yml b/roles/ceph-restapi/tasks/docker/copy_configs.yml
index cc8ea7f8d552f43277198e7916b78c550deb9aa9..ca7d6c18e945670408572ad6ea2e14846a1515b7 100644 (file)
--- a/roles/ceph-restapi/tasks/docker/copy_configs.yml
+++ b/roles/ceph-restapi/tasks/docker/copy_configs.yml
@@ -11,7 +11,8 @@
   become: false
   ignore_errors: true
   register: statconfig
-  always_run: true
+  tags:
+    - always
 
 - name: try to fetch ceph config and keys
   copy:

diff --git a/roles/ceph-restapi/tasks/start_restapi.yml b/roles/ceph-restapi/tasks/start_restapi.yml
index 1c4f23665b3a119196a9a2908dad1d5102ea9f8d..7ee48bf201d8b71123a0b072c09556bce72598ca 100644 (file)
--- a/roles/ceph-restapi/tasks/start_restapi.yml
+++ b/roles/ceph-restapi/tasks/start_restapi.yml
@@ -3,8 +3,9 @@
   shell: "pgrep -f ceph-rest-api"
   changed_when: false
   failed_when: false
-  always_run: true
   register: restapi_status
+  tags:
+    - always
 
 - name: start ceph rest api
   shell: "nohup ceph-rest-api --conf /etc/ceph/{{ cluster }}.conf &"

diff --git a/roles/ceph-rgw/tasks/docker/copy_configs.yml b/roles/ceph-rgw/tasks/docker/copy_configs.yml
index 46469f2863625bde79aa9250d7b527e26bc7e048..476f0dae2e688efad21717f06b8482386aa48e80 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/copy_configs.yml
+++ b/roles/ceph-rgw/tasks/docker/copy_configs.yml
@@ -10,8 +10,9 @@
   changed_when: false
   become: false
   ignore_errors: true
-  always_run: true
   register: statconfig
+  tags:
+    - always
 
 - name: try to fetch ceph config and keys
   copy:

diff --git a/roles/ceph-rgw/tasks/multisite/checks.yml b/roles/ceph-rgw/tasks/multisite/checks.yml
index c8565b4221f316aa51daefb4bcce54f9730e9c53..cf54052ccd146078cc453a394f2a93ac25316650 100644 (file)
--- a/roles/ceph-rgw/tasks/multisite/checks.yml
+++ b/roles/ceph-rgw/tasks/multisite/checks.yml
@@ -4,25 +4,29 @@
   register: realmcheck
   failed_when: False
   changed_when: False
-  always_run: True
+  tags:
+    - always
 
 - name: check if the zonegroup already exists
   command: radosgw-admin zonegroup get --rgw-zonegroup={{ rgw_zonegroup }}
   register: zonegroupcheck
   failed_when: False
   changed_when: False
-  always_run: True
+  tags:
+    - always
 
 - name: check if the zone already exists
   command: radosgw-admin zone get --rgw-zone={{ rgw_zone }}
   register: zonecheck
   failed_when: False
   changed_when: False
-  always_run: True
+  tags:
+    - always
 
 - name: check if the system user already exists
   command: radosgw-admin user info --uid=zone.user
   register: usercheck
   failed_when: False
   changed_when: False
-  always_run: True
+  tags:
+    - always

diff --git a/tests/functional/rhcs_setup.yml b/tests/functional/rhcs_setup.yml
index 00f81310302cd0c58a1bcfdf57269b5280458494..7c12c6ff0c6ba98cb89fc17f39a83a953668d6b1 100644 (file)
--- a/tests/functional/rhcs_setup.yml
+++ b/tests/functional/rhcs_setup.yml
@@ -53,7 +53,8 @@
       stat:
         path: /run/ostree-booted
       register: stat_ostree
-      always_run: true
+      tags:
+        - always
 
     - name: set fact for using Atomic host
       set_fact:
@@ -125,7 +126,7 @@
     - name: set MTU on eth2
       command: "ifconfig eth2 mtu 1400 up"
 
-- hosts: mdss:rgws:clients 
+- hosts: mdss:rgws:clients
   gather_facts: false
   become: yes
   tasks:

diff --git a/tests/functional/setup.yml b/tests/functional/setup.yml
index 881da27979ac4074c9c737257e11a5cb06300c61..e81173aaccfcd9fb1e69150f5552027928b30685 100644 (file)
--- a/tests/functional/setup.yml
+++ b/tests/functional/setup.yml
@@ -8,7 +8,8 @@
     - name: check if it is Atomic host
       stat: path=/run/ostree-booted
       register: stat_ostree
-      always_run: true
+      tags:
+        - always
 
     - name: set fact for using Atomic host
       set_fact: