Better --check compatibility for ceph-osd 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-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml
index 1ea1d5e9da46fd5aff8fac60436a8be14999dbc8..3b7a5919da9e5c29bba5d4bf2b82eb3e6eb43f8c 100644 (file)
--- a/roles/ceph-osd/tasks/activate_osds.yml
+++ b/roles/ceph-osd/tasks/activate_osds.yml
@@ -104,6 +104,7 @@
   shell: 'ls /var/lib/ceph/osd/ | grep -oP "\d+$"'
   changed_when: false
   failed_when: false
+  always_run: true
   register: osd_id
   when:
     - use_systemd

diff --git a/roles/ceph-osd/tasks/check_devices.yml b/roles/ceph-osd/tasks/check_devices.yml
index 5cad161fba6453fd46370871ad12da58a5bb2c42..5c8cb76ec322f4fd5faa5c5cb7323b8d3ab68daf 100644 (file)
--- a/roles/ceph-osd/tasks/check_devices.yml
+++ b/roles/ceph-osd/tasks/check_devices.yml
@@ -29,6 +29,7 @@
   with_items: "{{ raw_journal_devices|unique }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: journal_partition_status
   when: raw_multi_journal or dmcrypt_dedicated_journal
 

diff --git a/roles/ceph-osd/tasks/check_devices_auto.yml b/roles/ceph-osd/tasks/check_devices_auto.yml
index 29985bed13f3785d2032f52760971ae7a36ae2f2..19d82ba75d269e716dff35af5b6244bbd39ee69d 100644 (file)
--- a/roles/ceph-osd/tasks/check_devices_auto.yml
+++ b/roles/ceph-osd/tasks/check_devices_auto.yml
@@ -4,6 +4,7 @@
   with_dict: "{{ ansible_devices }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: ispartition_results
   when:
     - ansible_devices is defined
@@ -14,6 +15,7 @@
   with_dict: "{{ ansible_devices }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: osd_partition_status_results
   when:
     - ansible_devices is defined
@@ -37,6 +39,7 @@
   with_dict: "{{ ansible_devices }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: parted_results
   when:
     - ansible_devices is defined

diff --git a/roles/ceph-osd/tasks/check_devices_static.yml b/roles/ceph-osd/tasks/check_devices_static.yml
index 1228292e859b019c21db9e47bb06eda593347166..bf301c29fdbde66974debae0c768f67f24ba0c16 100644 (file)
--- a/roles/ceph-osd/tasks/check_devices_static.yml
+++ b/roles/ceph-osd/tasks/check_devices_static.yml
@@ -4,6 +4,7 @@
   with_items: "{{ devices }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: ispartition_results
 
 - name: check the partition status of the osd disks
@@ -11,6 +12,7 @@
   with_items: "{{ devices }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: osd_partition_status_results
 
 # NOTE: The following calls to sgdisk are retried because sgdisk is known to
@@ -31,4 +33,5 @@
   with_items: "{{ devices }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: parted_results

diff --git a/roles/ceph-osd/tasks/docker/checks.yml b/roles/ceph-osd/tasks/docker/checks.yml
index 09cb57b577440d923c8b11179af952b01e8cca31..968fc038cf215e407ccfce9386f44280021686b9 100644 (file)
--- a/roles/ceph-osd/tasks/docker/checks.yml
+++ b/roles/ceph-osd/tasks/docker/checks.yml
@@ -16,6 +16,7 @@
   with_items: "{{ ceph_config_keys }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: statleftover
 
 - name: fail if we find existing cluster files

diff --git a/roles/ceph-osd/tasks/docker/dirs_permissions.yml b/roles/ceph-osd/tasks/docker/dirs_permissions.yml
index 986e4498f16314a5a30c550e56501c8c4dce5672..cdafab0c73a1ebb25c0326927d11e49639327256 100644 (file)
--- a/roles/ceph-osd/tasks/docker/dirs_permissions.yml
+++ b/roles/ceph-osd/tasks/docker/dirs_permissions.yml
@@ -6,6 +6,7 @@
   changed_when: false
   failed_when: false
   run_once: true
+  always_run: true
   register: ceph_version
 
 - set_fact:

diff --git a/roles/ceph-osd/tasks/docker/fetch_configs.yml b/roles/ceph-osd/tasks/docker/fetch_configs.yml
index 5a740f7a6b13dc8182c9bafd83b42f93961a2e0f..bf908a5fd494ef5c0ec4e35c4047f356c63931af 100644 (file)
--- a/roles/ceph-osd/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-osd/tasks/docker/fetch_configs.yml
@@ -18,6 +18,7 @@
   changed_when: false
   become: false
   failed_when: false
+  always_run: true
   register: statconfig
 
 - name: try to copy ceph config and keys

diff --git a/roles/ceph-osd/tasks/docker/main.yml b/roles/ceph-osd/tasks/docker/main.yml
index b418fa132f72722d80ea168ef793f2ee55c8746d..3d778eb2d8fdbb5bc2c42b3963abddf56c7c771f 100644 (file)
--- a/roles/ceph-osd/tasks/docker/main.yml
+++ b/roles/ceph-osd/tasks/docker/main.yml
@@ -4,6 +4,7 @@
   register: ceph_health
   changed_when: false
   failed_when: false
+  always_run: true
 
 - include: checks.yml
   when:
@@ -14,6 +15,7 @@
 - name: check if it is Atomic host
   stat: path=/run/ostree-booted
   register: stat_ostree
+  always_run: true
 
 - name: set fact for using Atomic host
   set_fact:

diff --git a/roles/ceph-osd/tasks/docker/selinux.yml b/roles/ceph-osd/tasks/docker/selinux.yml
index 3630824d759a9aab7f7d69a96c52c9e4afb71dc5..6d4ee022f58272ad242b1234aa1e94f4b9ac6e27 100644 (file)
--- a/roles/ceph-osd/tasks/docker/selinux.yml
+++ b/roles/ceph-osd/tasks/docker/selinux.yml
@@ -3,6 +3,7 @@
   command: getenforce
   register: sestatus
   changed_when: false
+  always_run: true
 
 - name: set selinux permissions
   shell: chcon -Rt svirt_sandbox_file_t {{ item }}

diff --git a/roles/ceph-osd/tasks/docker/start_docker_osd.yml b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
index a39493168e0a288ae66c4d5fed266de1f60d5047..34c9f6c3fbccc176acd8c860785e4dfe5f7a3c7e 100644 (file)
--- a/roles/ceph-osd/tasks/docker/start_docker_osd.yml
+++ b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
@@ -12,6 +12,7 @@
 - name: verify if the disk was already prepared
   shell: "lsblk -o PARTLABEL {{ item }} | grep -sq 'ceph'"
   failed_when: false
+  always_run: true
   with_items: "{{ ceph_osd_docker_devices }}"
   register: osd_prepared
 

diff --git a/roles/ceph-osd/tasks/osd_fragment.yml b/roles/ceph-osd/tasks/osd_fragment.yml
index 7cd0f36a1c19927f725ceb6ed3933170e33ec4e1..9aa97b8a3c0bf62d0801d496520409fee0fd438a 100644 (file)
--- a/roles/ceph-osd/tasks/osd_fragment.yml
+++ b/roles/ceph-osd/tasks/osd_fragment.yml
@@ -4,6 +4,7 @@
   with_items: "{{ devices }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: osd_path
   when: not osd_directory
 
@@ -12,6 +13,7 @@
   with_items: "{{ osd_path.results }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: osd_id_non_dir_scenario
   when: not osd_directory
 
@@ -20,6 +22,7 @@
   with_items: "{{ osd_directories }}"
   changed_when: false
   failed_when: false
+  always_run: true
   register: osd_id_dir_scenario
   when: osd_directory