From 7b1dbbbdf8ede402bd8ca128a1f002d9d9b9589e Mon Sep 17 00:00:00 2001 From: Daniel Marks Date: Sat, 26 Nov 2016 20:52:24 +0100 Subject: [PATCH] Better --check compatibility for ceph-mds role Carefully chosen "always_run: true" parameters for read-only tasks that register variables. This enables --check runs (at least on deployed clusters). --- roles/ceph-mds/tasks/docker/checks.yml | 1 + roles/ceph-mds/tasks/docker/dirs_permissions.yml | 1 + roles/ceph-mds/tasks/docker/fetch_configs.yml | 1 + roles/ceph-mds/tasks/docker/main.yml | 2 ++ roles/ceph-mds/tasks/docker/selinux.yml | 1 + 5 files changed, 6 insertions(+) diff --git a/roles/ceph-mds/tasks/docker/checks.yml b/roles/ceph-mds/tasks/docker/checks.yml index 09cb57b57..968fc038c 100644 --- a/roles/ceph-mds/tasks/docker/checks.yml +++ b/roles/ceph-mds/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-mds/tasks/docker/dirs_permissions.yml b/roles/ceph-mds/tasks/docker/dirs_permissions.yml index e7ef2907f..b126f9172 100644 --- a/roles/ceph-mds/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-mds/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-mds/tasks/docker/fetch_configs.yml b/roles/ceph-mds/tasks/docker/fetch_configs.yml index 59fbf9f8b..de922eef8 100644 --- a/roles/ceph-mds/tasks/docker/fetch_configs.yml +++ b/roles/ceph-mds/tasks/docker/fetch_configs.yml @@ -14,6 +14,7 @@ changed_when: false become: false failed_when: false + always_run: true register: statconfig - name: try to fetch ceph config and keys diff --git a/roles/ceph-mds/tasks/docker/main.yml b/roles/ceph-mds/tasks/docker/main.yml index a021b823c..05995b7a6 100644 --- a/roles/ceph-mds/tasks/docker/main.yml +++ b/roles/ceph-mds/tasks/docker/main.yml @@ -4,10 +4,12 @@ register: ceph_health changed_when: false failed_when: false + always_run: true - 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-mds/tasks/docker/selinux.yml b/roles/ceph-mds/tasks/docker/selinux.yml index 3630824d7..6d4ee022f 100644 --- a/roles/ceph-mds/tasks/docker/selinux.yml +++ b/roles/ceph-mds/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 }}