From 404ad8f48491a48ccb352e9b169e25090d7666eb Mon Sep 17 00:00:00 2001 From: Daniel Marks Date: Sat, 26 Nov 2016 22:21:42 +0100 Subject: [PATCH] Better --check compatibility for ceph-rbd-mirror 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-rbd-mirror/tasks/docker/checks.yml | 1 + roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml | 1 + roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml | 1 + roles/ceph-rbd-mirror/tasks/docker/main.yml | 2 ++ roles/ceph-rbd-mirror/tasks/docker/selinux.yml | 1 + 5 files changed, 6 insertions(+) diff --git a/roles/ceph-rbd-mirror/tasks/docker/checks.yml b/roles/ceph-rbd-mirror/tasks/docker/checks.yml index 09cb57b57..968fc038c 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/checks.yml +++ b/roles/ceph-rbd-mirror/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-rbd-mirror/tasks/docker/dirs_permissions.yml b/roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml index 3a85017f2..dedc4948d 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml @@ -5,6 +5,7 @@ shell: docker inspect "docker.io/{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}:{{ ceph_rbd_mirror_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq changed_when: false failed_when: false + always_run: true run_once: true register: ceph_version diff --git a/roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml b/roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml index b2d3b6c82..2c4c4fa11 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/fetch_configs.yml @@ -13,6 +13,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-rbd-mirror/tasks/docker/main.yml b/roles/ceph-rbd-mirror/tasks/docker/main.yml index 87aace0be..ea7073118 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/main.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/main.yml @@ -4,9 +4,11 @@ register: ceph_health changed_when: false failed_when: false + always_run: true - name: check if it is Atomic host stat: path=/run/ostree-booted + always_run: true register: stat_ostree - name: set fact for using Atomic host diff --git a/roles/ceph-rbd-mirror/tasks/docker/selinux.yml b/roles/ceph-rbd-mirror/tasks/docker/selinux.yml index ce8b3054f..59fd6667a 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/selinux.yml +++ b/roles/ceph-rbd-mirror/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 }} -- 2.39.5