From 74cf3532a9e828cff078bd8bd23da6273c38479b Mon Sep 17 00:00:00 2001 From: Daniel Marks Date: Sun, 27 Nov 2016 14:27:28 +0100 Subject: [PATCH] Better --check compatibility for ceph-rgw 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-rgw/tasks/docker/checks.yml | 1 + roles/ceph-rgw/tasks/docker/copy_configs.yml | 1 + roles/ceph-rgw/tasks/docker/dirs_permissions.yml | 1 + roles/ceph-rgw/tasks/docker/fetch_configs.yml | 1 + roles/ceph-rgw/tasks/docker/main.yml | 2 ++ roles/ceph-rgw/tasks/docker/selinux.yml | 1 + roles/ceph-rgw/tasks/multisite/checks.yml | 4 ++++ 7 files changed, 11 insertions(+) diff --git a/roles/ceph-rgw/tasks/docker/checks.yml b/roles/ceph-rgw/tasks/docker/checks.yml index 09cb57b57..968fc038c 100644 --- a/roles/ceph-rgw/tasks/docker/checks.yml +++ b/roles/ceph-rgw/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-rgw/tasks/docker/copy_configs.yml b/roles/ceph-rgw/tasks/docker/copy_configs.yml index 10e705220..757648a2e 100644 --- a/roles/ceph-rgw/tasks/docker/copy_configs.yml +++ b/roles/ceph-rgw/tasks/docker/copy_configs.yml @@ -17,6 +17,7 @@ changed_when: false become: false failed_when: false + always_run: true register: statconfig when: - nfs_obj_gw diff --git a/roles/ceph-rgw/tasks/docker/dirs_permissions.yml b/roles/ceph-rgw/tasks/docker/dirs_permissions.yml index ccdf915fb..a80902a48 100644 --- a/roles/ceph-rgw/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-rgw/tasks/docker/dirs_permissions.yml @@ -5,6 +5,7 @@ shell: docker inspect "docker.io/{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_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-rgw/tasks/docker/fetch_configs.yml b/roles/ceph-rgw/tasks/docker/fetch_configs.yml index 19337240d..ee8b16e3e 100644 --- a/roles/ceph-rgw/tasks/docker/fetch_configs.yml +++ b/roles/ceph-rgw/tasks/docker/fetch_configs.yml @@ -11,6 +11,7 @@ changed_when: false become: false ignore_errors: true + always_run: true register: statconfig - name: try to fetch ceph config and keys diff --git a/roles/ceph-rgw/tasks/docker/main.yml b/roles/ceph-rgw/tasks/docker/main.yml index 96de18281..6fcb14abb 100644 --- a/roles/ceph-rgw/tasks/docker/main.yml +++ b/roles/ceph-rgw/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-rgw/tasks/docker/selinux.yml b/roles/ceph-rgw/tasks/docker/selinux.yml index 3630824d7..6d4ee022f 100644 --- a/roles/ceph-rgw/tasks/docker/selinux.yml +++ b/roles/ceph-rgw/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-rgw/tasks/multisite/checks.yml b/roles/ceph-rgw/tasks/multisite/checks.yml index 7bc6bbb8d..c8565b422 100644 --- a/roles/ceph-rgw/tasks/multisite/checks.yml +++ b/roles/ceph-rgw/tasks/multisite/checks.yml @@ -4,21 +4,25 @@ register: realmcheck failed_when: False changed_when: False + always_run: True - 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 - 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 - 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