Better --check compatibility for ceph-common role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

diff --git a/roles/ceph-common/tasks/checks/check_firewall.yml b/roles/ceph-common/tasks/checks/check_firewall.yml
index 3d829e89387da87cf69b6dc36dafda7bde0a68f0..0d985fa3c7ae8d3a7652d12ef1f8dc35c2c821d1 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_firewall.yml
+++ b/roles/ceph-common/tasks/checks/check_firewall.yml
@@ -5,6 +5,7 @@
   failed_when: false
   register: nmapexist
   run_once: true
+  always_run: true
 
 - name: inform that nmap is not present
   debug:
@@ -18,6 +19,7 @@
   changed_when: false
   failed_when: false
   register: monportstate
+  always_run: true
   when:
     - mon_group_name in group_names
     - nmapexist.rc == 0
@@ -35,6 +37,7 @@
   changed_when: false
   failed_when: false
   register: osdrangestate
+  always_run: true
   when:
     - osd_group_name in group_names
     - nmapexist.rc == 0
@@ -52,6 +55,7 @@
   changed_when: false
   failed_when: false
   register: mdsrangestate
+  always_run: true
   when:
     - mds_group_name in group_names
     - nmapexist.rc == 0
@@ -69,6 +73,7 @@
   changed_when: false
   failed_when: false
   register: rgwportstate
+  always_run: true
   when:
     - rgw_group_name in group_names
     - nmapexist.rc == 0
@@ -86,6 +91,7 @@
   changed_when: false
   failed_when: false
   register: nfsportstate
+  always_run: true
   when:
     - nfs_group_name in group_names
     - nmapexist.rc == 0

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index 9a464988b392a2c807aa3a57793a1277533e6587..a1e5f7c487ba1ebfbbd79584c70ba61d12ec74a0 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -47,7 +47,7 @@
     update_cache: yes
   when: nfs_group_name in group_names
 
-- name: install NFS gateway  
+- name: install NFS gateway
   apt:
     pkg: nfs-ganesha
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 9968be577cfda7b98437505e483055203e6640ef..300b7cbb9465e091cb207979c2ca782b93547743 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -270,6 +270,7 @@
   stat:
     path: /etc/default/ceph
   register: etc_default_ceph
+  always_run: true
   when: ansible_os_family == "Debian"
 
 - name: configure cluster name

diff --git a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml b/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml
index d2d7ab8643a879d75bde75efd456b0112f104ccc..5c2719ee3e8b9944993a9082599fddd2a46c7272 100644 (file)
--- a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml
+++ b/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml
@@ -3,12 +3,14 @@
   command: subscription-manager identity
   register: subscription
   changed_when: false
+  always_run: true
 
 - name: check if the red hat storage monitor repo is already present
   shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms
   changed_when: false
   failed_when: false
   register: rh_storage_mon_repo
+  always_run: true
   when: mon_group_name in group_names
 
 - name: enable red hat storage monitor repository
@@ -23,6 +25,7 @@
   changed_when: false
   failed_when: false
   register: rh_storage_osd_repo
+  always_run: true
   when: osd_group_name in group_names
 
 - name: enable red hat storage osd repository
@@ -37,6 +40,7 @@
   changed_when: false
   failed_when: false
   register: rh_storage_rgw_repo
+  always_run: true
   when: rgw_group_name in group_names
 
 - name: enable red hat storage rados gateway repository