From c2b5118c1bb6e6dce285bcda887df3cada4c002a Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Wed, 25 Oct 2017 09:48:09 -0500 Subject: [PATCH] Revert "Avoid deprecated always_run" This reverts commit 620fb37dd481dc570fac6291dcfd82c855f2dcb7. --- roles/ceph-common-coreos/tasks/main.yml | 6 +-- .../tasks/checks/check_firewall.yml | 18 +++----- .../ceph-common/tasks/checks/check_system.yml | 3 +- .../tasks/configure_cluster_name.yml | 3 +- .../prerequisite_rhcs_cdn_install.yml | 9 ++-- roles/ceph-common/tasks/main.yml | 3 +- .../ceph-common/tasks/misc/system_tuning.yml | 3 +- roles/ceph-config/tasks/main.yml | 3 +- .../tasks/check_socket_container.yml | 21 ++++------ .../tasks/check_socket_non_container.yml | 42 +++++++------------ roles/ceph-defaults/tasks/facts.yml | 6 +-- .../tasks/checks/check_ntp_atomic.yml | 3 +- .../tasks/checks/check_ntp_debian.yml | 3 +- .../tasks/checks/check_ntp_redhat.yml | 3 +- roles/ceph-docker-common/tasks/main.yml | 12 ++---- roles/ceph-docker-common/tasks/selinux.yml | 3 +- .../tasks/stat_ceph_files.yml | 3 +- roles/ceph-fetch-keys/tasks/main.yml | 3 +- roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml | 3 +- roles/ceph-mds/tasks/containerized.yml | 3 +- roles/ceph-mgr/tasks/docker/copy_configs.yml | 6 +-- roles/ceph-mon/tasks/ceph_keys.yml | 15 +++---- roles/ceph-mon/tasks/deploy_monitors.yml | 3 +- roles/ceph-mon/tasks/docker/copy_configs.yml | 3 +- roles/ceph-mon/tasks/docker/main.yml | 3 +- roles/ceph-mon/tasks/secure_cluster.yml | 3 +- roles/ceph-nfs/tasks/ganesha_selinux_fix.yml | 3 +- .../tasks/pre_requisite_container.yml | 3 +- roles/ceph-osd/tasks/check_devices.yml | 3 +- roles/ceph-osd/tasks/check_devices_static.yml | 3 +- roles/ceph-osd/tasks/copy_configs.yml | 3 +- roles/ceph-osd/tasks/main.yml | 3 +- roles/ceph-osd/tasks/osd_fragment.yml | 6 +-- roles/ceph-osd/tasks/start_osds.yml | 3 +- .../tasks/docker/copy_configs.yml | 3 +- .../tasks/docker/copy_configs.yml | 3 +- roles/ceph-restapi/tasks/start_restapi.yml | 3 +- roles/ceph-rgw/tasks/docker/copy_configs.yml | 3 +- roles/ceph-rgw/tasks/multisite/checks.yml | 12 ++---- tests/functional/rhcs_setup.yml | 5 +-- tests/functional/setup.yml | 3 +- 41 files changed, 82 insertions(+), 163 deletions(-) diff --git a/roles/ceph-common-coreos/tasks/main.yml b/roles/ceph-common-coreos/tasks/main.yml index 249a186fe..f858ae5fd 100644 --- a/roles/ceph-common-coreos/tasks/main.yml +++ b/roles/ceph-common-coreos/tasks/main.yml @@ -3,8 +3,7 @@ raw: stat $HOME/.python register: need_python ignore_errors: true - tags: - - always + always_run: true - include: install_pypy.yml when: need_python | failed @@ -13,8 +12,7 @@ raw: stat $HOME/.pip register: need_pip ignore_errors: true - tags: - - always + always_run: true - include: install_pip.yml when: need_pip | failed and need_python | failed diff --git a/roles/ceph-common/tasks/checks/check_firewall.yml b/roles/ceph-common/tasks/checks/check_firewall.yml index 75378fea3..458da0711 100644 --- a/roles/ceph-common/tasks/checks/check_firewall.yml +++ b/roles/ceph-common/tasks/checks/check_firewall.yml @@ -5,8 +5,7 @@ failed_when: false register: nmapexist run_once: true - tags: - - always + always_run: true - name: inform that nmap is not present debug: @@ -20,11 +19,10 @@ changed_when: false failed_when: false register: monportstate + always_run: true when: - mon_group_name in group_names - nmapexist.rc == 0 - tags: - - always - name: fail if monitor port is filtered fail: @@ -39,11 +37,10 @@ changed_when: false failed_when: false register: osdrangestate + always_run: true when: - osd_group_name in group_names - nmapexist.rc == 0 - tags: - - always - name: fail if osd and mds range is filtered (osd hosts) fail: @@ -58,11 +55,10 @@ changed_when: false failed_when: false register: mdsrangestate + always_run: true when: - mds_group_name in group_names - nmapexist.rc == 0 - tags: - - always - name: fail if osd and mds range is filtered (mds hosts) fail: @@ -77,11 +73,10 @@ changed_when: false failed_when: false register: rgwportstate + always_run: true when: - rgw_group_name in group_names - nmapexist.rc == 0 - tags: - - always - name: fail if rados gateway port is filtered fail: @@ -96,11 +91,10 @@ changed_when: false failed_when: false register: nfsportstate + always_run: true when: - nfs_group_name in group_names - nmapexist.rc == 0 - tags: - - always - name: fail if NFS ports are filtered fail: diff --git a/roles/ceph-common/tasks/checks/check_system.yml b/roles/ceph-common/tasks/checks/check_system.yml index 6d31d1277..4e0be38cd 100644 --- a/roles/ceph-common/tasks/checks/check_system.yml +++ b/roles/ceph-common/tasks/checks/check_system.yml @@ -30,12 +30,11 @@ register: subscription changed_when: false failed_when: false + always_run: true when: - ansible_distribution == 'Red Hat Enterprise Linux' - ceph_repository == 'rhcs' - ceph_repository_type == 'cdn' - tags: - - always - name: fail on unregistered red hat rhcs linux fail: diff --git a/roles/ceph-common/tasks/configure_cluster_name.yml b/roles/ceph-common/tasks/configure_cluster_name.yml index b02f8ce98..cff82d47a 100644 --- a/roles/ceph-common/tasks/configure_cluster_name.yml +++ b/roles/ceph-common/tasks/configure_cluster_name.yml @@ -23,10 +23,9 @@ stat: path: /etc/default/ceph register: etc_default_ceph + always_run: true when: - ansible_os_family == "Debian" - tags: - - always - name: configure cluster name lineinfile: diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml index b22cf4e17..1b22afda4 100644 --- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml +++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml @@ -4,10 +4,9 @@ changed_when: false failed_when: false register: rhcs_mon_repo + always_run: true when: - mon_group_name in group_names - tags: - - always - name: enable red hat storage monitor repository command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms @@ -21,10 +20,9 @@ changed_when: false failed_when: false register: rhcs_osd_repo + always_run: true when: - osd_group_name in group_names - tags: - - always - name: enable red hat storage osd repository command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms @@ -38,10 +36,9 @@ changed_when: false failed_when: false register: rhcs_rgw_mds_nfs_repo + always_run: true when: - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names) - tags: - - always - name: enable red hat storage rados gateway / mds repository command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 20fa452c0..52064ea05 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -57,9 +57,8 @@ - name: get ceph version command: ceph --version changed_when: false + always_run: yes register: ceph_version - tags: - - always - name: set_fact ceph_version set_fact: diff --git a/roles/ceph-common/tasks/misc/system_tuning.yml b/roles/ceph-common/tasks/misc/system_tuning.yml index 901d67910..0aeced9ff 100644 --- a/roles/ceph-common/tasks/misc/system_tuning.yml +++ b/roles/ceph-common/tasks/misc/system_tuning.yml @@ -33,9 +33,8 @@ command: sysctl -b vm.min_free_kbytes changed_when: false failed_when: false + always_run: yes register: default_vm_min_free_kbytes - tags: - - always - name: set_fact vm_min_free_kbytes set_fact: diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index 97520b2ef..476717e51 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -88,11 +88,10 @@ removes="{{ fetch_directory }}/ceph_cluster_uuid.conf" changed_when: false register: cluster_uuid + always_run: true become: false when: - generate_fsid - tags: - - always - name: ensure /etc/ceph exists file: diff --git a/roles/ceph-defaults/tasks/check_socket_container.yml b/roles/ceph-defaults/tasks/check_socket_container.yml index 4268c22fb..856a4192c 100644 --- a/roles/ceph-defaults/tasks/check_socket_container.yml +++ b/roles/ceph-defaults/tasks/check_socket_container.yml @@ -4,67 +4,60 @@ register: ceph_mon_container_stat changed_when: false failed_when: false + always_run: true when: - inventory_hostname in groups.get(mon_group_name, []) - tags: - - always - name: check for an osd container command: "docker ps -q --filter='name=ceph-osd-{{ ansible_hostname }}'" register: ceph_osd_container_stat changed_when: false failed_when: false + always_run: true when: - inventory_hostname in groups.get(osd_group_name, []) - tags: - - always - name: check for a mds container command: "docker ps -q --filter='name=ceph-mds-{{ ansible_hostname }}'" register: ceph_mds_container_stat changed_when: false failed_when: false + always_run: true when: - inventory_hostname in groups.get(mds_group_name, []) - tags: - - always - name: check for a rgw container command: "docker ps -q --filter='name=ceph-rgw-{{ ansible_hostname }}'" register: ceph_rgw_container_stat changed_when: false failed_when: false + always_run: true when: - inventory_hostname in groups.get(rgw_group_name, []) - tags: - - always - name: check for a mgr container command: "docker ps -q --filter='name=ceph-mgr-{{ ansible_hostname }}'" register: ceph_mgr_container_stat changed_when: false failed_when: false + always_run: true when: - inventory_hostname in groups.get(mgr_group_name, []) - tags: - - always - name: check for a rbd mirror container command: "docker ps -q --filter='name=ceph-rbd-mirror-{{ ansible_hostname }}'" register: ceph_rbd_mirror_container_stat changed_when: false failed_when: false + always_run: true when: - inventory_hostname in groups.get(rbdmirror_group_name, []) - tags: - - always - name: check for a nfs container command: "docker ps -q --filter='name=ceph-nfs-{{ ansible_hostname }}'" register: ceph_nfs_container_stat changed_when: false failed_when: false + always_run: true when: - inventory_hostname in groups.get(nfs_group_name, []) - tags: - - always diff --git a/roles/ceph-defaults/tasks/check_socket_non_container.yml b/roles/ceph-defaults/tasks/check_socket_non_container.yml index d93125dd3..4ad560ad0 100644 --- a/roles/ceph-defaults/tasks/check_socket_non_container.yml +++ b/roles/ceph-defaults/tasks/check_socket_non_container.yml @@ -3,22 +3,20 @@ shell: stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mon*.asok changed_when: false failed_when: false + always_run: true register: mon_socket_stat when: - inventory_hostname in groups.get(mon_group_name, []) - tags: - - always - name: check if the ceph mon socket is in-use command: fuser --silent {{ mon_socket_stat.stdout }} changed_when: false failed_when: false + always_run: true register: mon_socket when: - inventory_hostname in groups.get(mon_group_name, []) - mon_socket_stat.rc == 0 - tags: - - always - name: remove ceph mon socket if exists and not used by a process file: @@ -34,22 +32,20 @@ stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-osd*.asok changed_when: false failed_when: false + always_run: true register: osd_socket_stat when: - inventory_hostname in groups.get(osd_group_name, []) - tags: - - always - name: check if the ceph osd socket is in-use command: fuser --silent {{ osd_socket_stat.stdout }} changed_when: false failed_when: false + always_run: true register: osd_socket when: - inventory_hostname in groups.get(osd_group_name, []) - osd_socket_stat.rc == 0 - tags: - - always - name: remove ceph osd socket if exists and not used by a process file: @@ -65,22 +61,20 @@ stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mds*.asok changed_when: false failed_when: false + always_run: true register: mds_socket_stat when: - inventory_hostname in groups.get(mds_group_name, []) - tags: - - always - name: check if the ceph mds socket is in-use command: fuser --silent {{ mds_socket_stat.stdout }} changed_when: false failed_when: false + always_run: true register: mds_socket when: - inventory_hostname in groups.get(mds_group_name, []) - mds_socket_stat.rc == 0 - tags: - - always - name: remove ceph mds socket if exists and not used by a process file: @@ -96,22 +90,20 @@ stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-client.rgw*.asok changed_when: false failed_when: false + always_run: true register: rgw_socket_stat when: - inventory_hostname in groups.get(rgw_group_name, []) - tags: - - always - name: check if the ceph rgw socket is in-use command: fuser --silent {{ rgw_socket_stat.stdout }} changed_when: false failed_when: false + always_run: true register: rgw_socket when: - inventory_hostname in groups.get(rgw_group_name, []) - rgw_socket_stat.rc == 0 - tags: - - always - name: remove ceph rgw socket if exists and not used by a process file: @@ -127,22 +119,20 @@ stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-mgr*.asok changed_when: false failed_when: false + always_run: true register: mgr_socket_stat when: - inventory_hostname in groups.get(mgr_group_name, []) - tags: - - always - name: check if the ceph mgr socket is in-use command: fuser --silent {{ mgr_socket_stat.stdout }} changed_when: false failed_when: false + always_run: true register: mgr_socket when: - inventory_hostname in groups.get(mgr_group_name, []) - mgr_socket_stat.rc == 0 - tags: - - always - name: remove ceph mgr socket if exists and not used by a process file: @@ -158,22 +148,20 @@ stat --printf=%n {{ rbd_client_admin_socket_path }}/{{ cluster }}-client.rbd-mirror*.asok changed_when: false failed_when: false + always_run: true register: rbd_mirror_socket_stat when: - inventory_hostname in groups.get(rbdmirror_group_name, []) - tags: - - always - name: check if the ceph rbd mirror socket is in-use command: fuser --silent {{ rbd_mirror_socket_stat.stdout }} changed_when: false failed_when: false + always_run: true register: rbd_mirror_socket when: - inventory_hostname in groups.get(rbdmirror_group_name, []) - rbd_mirror_socket_stat.rc == 0 - tags: - - always - name: remove ceph rbd mirror socket if exists and not used by a process file: @@ -188,22 +176,20 @@ command: stat --printf=%n /var/run/ganesha.pid changed_when: false failed_when: false + always_run: true register: nfs_socket_stat when: - inventory_hostname in groups.get(nfs_group_name, []) - tags: - - always - name: check if the ceph nfs ganesha socket is in-use command: fuser --silent {{ nfs_socket_stat.stdout }} changed_when: false failed_when: false + always_run: true register: nfs_socket when: - inventory_hostname in groups.get(nfs_group_name, []) - nfs_socket_stat.rc == 0 - tags: - - always - name: remove ceph nfs ganesha socket if exists and not used by a process file: diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml index b945fc0ed..8d2e5c606 100644 --- a/roles/ceph-defaults/tasks/facts.yml +++ b/roles/ceph-defaults/tasks/facts.yml @@ -18,13 +18,12 @@ command: "{{ docker_exec_cmd }} ceph --connect-timeout 3 --cluster {{ cluster }} fsid" changed_when: false failed_when: false + always_run: yes register: ceph_current_fsid delegate_to: "{{ groups[mon_group_name][0] }}" when: - not rolling_update - groups.get(mon_group_name, []) | length > 0 - tags: - - always # We want this check to be run only on the first node - name: check if {{ fetch_directory }} directory exists @@ -83,10 +82,9 @@ changed_when: false register: cluster_uuid become: false + always_run: true when: - generate_fsid - tags: - - always - name: set_fact fsid set_fact: diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml index 119c0ae38..548f1765f 100644 --- a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml +++ b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml @@ -5,6 +5,5 @@ warn: no register: ntp_pkg_query ignore_errors: true + always_run: true changed_when: false - tags: - - always diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml index 1d537825b..c666958ca 100644 --- a/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml +++ b/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml @@ -3,11 +3,10 @@ command: dpkg -s ntp register: ntp_pkg_query ignore_errors: true + always_run: true changed_when: false when: - ansible_os_family == 'Debian' - tags: - - always - name: install ntp on debian package: diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml index 8327d25dc..1f52296b6 100644 --- a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml +++ b/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml @@ -5,11 +5,10 @@ warn: no register: ntp_pkg_query ignore_errors: true + always_run: true changed_when: false when: - ansible_os_family == 'RedHat' - tags: - - always - name: install ntp on redhat package: diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml index 8e44b53fd..2f4b765e0 100644 --- a/roles/ceph-docker-common/tasks/main.yml +++ b/roles/ceph-docker-common/tasks/main.yml @@ -9,8 +9,7 @@ stat: path: /run/ostree-booted register: stat_ostree - tags: - - always + always_run: true - name: set_fact is_atomic set_fact: @@ -39,9 +38,8 @@ - name: get docker version command: docker --version changed_when: false + always_run: yes register: docker_version - tags: - - always - name: set_fact docker_version docker_version.stdout.split set_fact: @@ -58,8 +56,7 @@ register: ceph_health changed_when: false failed_when: false - tags: - - always + always_run: true - name: include checks.yml include: checks.yml @@ -99,9 +96,8 @@ - name: get ceph version command: docker run --entrypoint /usr/bin/ceph {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} --version changed_when: false + always_run: yes register: ceph_version - tags: - - always - name: set_fact ceph_version ceph_version.stdout.split set_fact: diff --git a/roles/ceph-docker-common/tasks/selinux.yml b/roles/ceph-docker-common/tasks/selinux.yml index 08651804b..8e74a6375 100644 --- a/roles/ceph-docker-common/tasks/selinux.yml +++ b/roles/ceph-docker-common/tasks/selinux.yml @@ -3,5 +3,4 @@ command: getenforce register: sestatus changed_when: false - tags: - - always + always_run: true diff --git a/roles/ceph-docker-common/tasks/stat_ceph_files.yml b/roles/ceph-docker-common/tasks/stat_ceph_files.yml index ba4fd5ac0..ffd50b57f 100644 --- a/roles/ceph-docker-common/tasks/stat_ceph_files.yml +++ b/roles/ceph-docker-common/tasks/stat_ceph_files.yml @@ -34,6 +34,5 @@ become: false failed_when: false register: statconfig - tags: - - always + always_run: true diff --git a/roles/ceph-fetch-keys/tasks/main.yml b/roles/ceph-fetch-keys/tasks/main.yml index 2635d8c96..7719a1c40 100644 --- a/roles/ceph-fetch-keys/tasks/main.yml +++ b/roles/ceph-fetch-keys/tasks/main.yml @@ -3,8 +3,7 @@ shell: ls -1 /etc/ceph/*.keyring changed_when: false register: ceph_keys - tags: - - always + always_run: true - name: set keys permissions file: diff --git a/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml b/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml index d8b8dd2b6..c4df5830f 100644 --- a/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml +++ b/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml @@ -12,9 +12,8 @@ with_items: "{{ crt_files }}" changed_when: false failed_when: false + always_run: true register: crt_files_exist - tags: - - always - name: try to fetch crt file(s) copy: diff --git a/roles/ceph-mds/tasks/containerized.yml b/roles/ceph-mds/tasks/containerized.yml index 9057ae2fc..ead7d18fd 100644 --- a/roles/ceph-mds/tasks/containerized.yml +++ b/roles/ceph-mds/tasks/containerized.yml @@ -14,9 +14,8 @@ changed_when: false become: false failed_when: false + always_run: true register: statconfig - tags: - - always - name: try to fetch ceph config and keys copy: diff --git a/roles/ceph-mgr/tasks/docker/copy_configs.yml b/roles/ceph-mgr/tasks/docker/copy_configs.yml index eedbff682..d90ce7671 100644 --- a/roles/ceph-mgr/tasks/docker/copy_configs.yml +++ b/roles/ceph-mgr/tasks/docker/copy_configs.yml @@ -11,9 +11,8 @@ changed_when: false become: false failed_when: false + always_run: true register: statconfig - tags: - - always - name: try to fetch ceph config and keys copy: @@ -31,10 +30,9 @@ - name: "copy mgr key to /var/lib/ceph/mgr/{{ cluster }}-{{ ansible_hostname }}/keyring" command: cp /etc/ceph/{{ cluster }}.mgr.{{ ansible_hostname }}.keyring /var/lib/ceph/mgr/{{ cluster }}-{{ ansible_hostname }}/keyring changed_when: false + always_run: true with_items: "{{ statconfig.results }}" when: item.stat.exists == true - tags: - - always - name: set ceph mgr key permission file: diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml index 3c4096dc6..23c805a25 100644 --- a/roles/ceph-mon/tasks/ceph_keys.yml +++ b/roles/ceph-mon/tasks/ceph_keys.yml @@ -4,20 +4,18 @@ args: creates: /etc/ceph/{{ cluster }}.client.admin.keyring changed_when: false + always_run: true when: - cephx - ceph_release_num[ceph_release] >= ceph_release_num.luminous - tags: - - always - name: collect admin and bootstrap keys command: ceph-create-keys --cluster {{ cluster }} -i {{ monitor_name }} changed_when: false + always_run: true when: - cephx - ceph_release_num[ceph_release] < ceph_release_num.luminous - tags: - - always # NOTE (leseb): wait for mon discovery and quorum resolution # the admin key is not instantaneously created so we have to wait a bit @@ -44,21 +42,19 @@ command: ceph --cluster {{ cluster }} config-key get initial_mon_keyring changed_when: false ignore_errors: true + always_run: true run_once: true failed_when: false register: is_initial_mon_keyring_in_kv - tags: - - always - name: put initial mon keyring in mon kv store command: ceph --cluster {{ cluster }} config-key put initial_mon_keyring {{ monitor_keyring.stdout }} changed_when: false + always_run: true run_once: true when: - is_initial_mon_keyring_in_kv.rc != 0 - cephx - tags: - - always - name: create ceph rest api keyring when mon is not containerized command: ceph --cluster {{ cluster }} auth get-or-create client.restapi osd 'allow *' mon 'allow *' -o /etc/ceph/{{ cluster }}.client.restapi.keyring @@ -91,10 +87,9 @@ shell: ls -1 /etc/ceph/*.keyring changed_when: false register: ceph_keys + always_run: true when: - cephx - tags: - - always - name: set keys permissions file: diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml index b759183b0..6bb83cbb5 100644 --- a/roles/ceph-mon/tasks/deploy_monitors.yml +++ b/roles/ceph-mon/tasks/deploy_monitors.yml @@ -12,9 +12,8 @@ changed_when: false register: monitor_keyring become: false + always_run: true when: cephx - tags: - - always - name: create monitor initial keyring command: ceph-authtool /var/lib/ceph/tmp/keyring.mon.{{ monitor_name }} --create-keyring --name=mon. --add-key={{ monitor_secret }} --cap mon 'allow *' diff --git a/roles/ceph-mon/tasks/docker/copy_configs.yml b/roles/ceph-mon/tasks/docker/copy_configs.yml index 7fbf3c03d..ed68be08c 100644 --- a/roles/ceph-mon/tasks/docker/copy_configs.yml +++ b/roles/ceph-mon/tasks/docker/copy_configs.yml @@ -47,8 +47,7 @@ become: false failed_when: false register: statconfig - tags: - - always + always_run: true - name: try to copy ceph config and keys copy: diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml index 9be583778..400ff5445 100644 --- a/roles/ceph-mon/tasks/docker/main.yml +++ b/roles/ceph-mon/tasks/docker/main.yml @@ -110,10 +110,9 @@ become: false failed_when: false register: stat_mgr_keys + always_run: true when: - "{{ groups.get(mgr_group_name, []) | length > 0 }}" - tags: - - always - name: fetch ceph mgr key(s) fetch: diff --git a/roles/ceph-mon/tasks/secure_cluster.yml b/roles/ceph-mon/tasks/secure_cluster.yml index e0dfbb9f6..893c98ab6 100644 --- a/roles/ceph-mon/tasks/secure_cluster.yml +++ b/roles/ceph-mon/tasks/secure_cluster.yml @@ -2,8 +2,7 @@ - name: collect all the pools command: rados --cluster {{ cluster }} lspools register: ceph_pools - tags: - - always + always_run: true - name: secure the cluster command: ceph --cluster {{ cluster }} osd pool set {{ item[0] }} {{ item[1] }} true diff --git a/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml b/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml index 04da5c82e..0aa3c66ed 100644 --- a/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml +++ b/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml @@ -4,8 +4,7 @@ register: selinuxstatus changed_when: false failed_when: false - tags: - - always + always_run: true - name: install policycoreutils-python to get semanage package: diff --git a/roles/ceph-nfs/tasks/pre_requisite_container.yml b/roles/ceph-nfs/tasks/pre_requisite_container.yml index bde0882d9..142b9a38b 100644 --- a/roles/ceph-nfs/tasks/pre_requisite_container.yml +++ b/roles/ceph-nfs/tasks/pre_requisite_container.yml @@ -10,9 +10,8 @@ changed_when: false become: false failed_when: false + always_run: true register: statconfig - tags: - - always - name: try to fetch config and keys copy: diff --git a/roles/ceph-osd/tasks/check_devices.yml b/roles/ceph-osd/tasks/check_devices.yml index 72f38b158..d4aaaa338 100644 --- a/roles/ceph-osd/tasks/check_devices.yml +++ b/roles/ceph-osd/tasks/check_devices.yml @@ -42,11 +42,10 @@ - "{{ dedicated_devices|unique }}" changed_when: false failed_when: false + always_run: true register: journal_partition_status when: - osd_scenario == 'non-collocated' - tags: - - always - name: fix partitions gpt header or labels of the journal device(s) shell: "sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }}" diff --git a/roles/ceph-osd/tasks/check_devices_static.yml b/roles/ceph-osd/tasks/check_devices_static.yml index 060528b20..3a4ca7934 100644 --- a/roles/ceph-osd/tasks/check_devices_static.yml +++ b/roles/ceph-osd/tasks/check_devices_static.yml @@ -5,9 +5,8 @@ - "{{ devices }}" changed_when: false failed_when: false + always_run: true register: osd_partition_status_results - tags: - - always # NOTE: The following calls to sgdisk are retried because sgdisk is known to # fully wipe a device the first time around. There is no need to halt execution diff --git a/roles/ceph-osd/tasks/copy_configs.yml b/roles/ceph-osd/tasks/copy_configs.yml index ec53866d2..616e6d28c 100644 --- a/roles/ceph-osd/tasks/copy_configs.yml +++ b/roles/ceph-osd/tasks/copy_configs.yml @@ -15,9 +15,8 @@ changed_when: false become: false failed_when: false + always_run: true register: statconfig - tags: - - always - name: try to copy ceph config and keys copy: diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml index afc42af99..e54a27871 100644 --- a/roles/ceph-osd/tasks/main.yml +++ b/roles/ceph-osd/tasks/main.yml @@ -40,9 +40,8 @@ - "{{ devices }}" changed_when: false failed_when: false + always_run: true register: parted_results - tags: - - always - name: include copy_configs.yml include: copy_configs.yml diff --git a/roles/ceph-osd/tasks/osd_fragment.yml b/roles/ceph-osd/tasks/osd_fragment.yml index df60e815c..f7e71d6cc 100644 --- a/roles/ceph-osd/tasks/osd_fragment.yml +++ b/roles/ceph-osd/tasks/osd_fragment.yml @@ -4,18 +4,16 @@ with_items: "{{ devices }}" changed_when: false failed_when: false + always_run: true register: osd_path - tags: - - always - name: get osd id command: cat {{ item.stdout }}/whoami with_items: "{{ osd_path.results }}" changed_when: false failed_when: false + always_run: true register: osd_id_non_dir_scenario - tags: - - always # NOTE (leseb): we must do this because of # https://github.com/ansible/ansible/issues/4297 diff --git a/roles/ceph-osd/tasks/start_osds.yml b/roles/ceph-osd/tasks/start_osds.yml index 5419d1d37..da140bd07 100644 --- a/roles/ceph-osd/tasks/start_osds.yml +++ b/roles/ceph-osd/tasks/start_osds.yml @@ -4,11 +4,10 @@ ls /var/lib/ceph/osd/ | sed 's/.*-//' changed_when: false failed_when: false + always_run: true register: osd_id until: osd_id.stdout_lines|length == devices|unique|length retries: 10 - tags: - - always - name: ensure systemd service override directory exists file: diff --git a/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml b/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml index 1425ccf40..bc668710d 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml @@ -17,10 +17,9 @@ changed_when: false become: false failed_when: false + always_run: true register: statconfig when: "item | length > 0" - tags: - - always - name: try to fetch ceph config and keys copy: diff --git a/roles/ceph-restapi/tasks/docker/copy_configs.yml b/roles/ceph-restapi/tasks/docker/copy_configs.yml index ca7d6c18e..cc8ea7f8d 100644 --- a/roles/ceph-restapi/tasks/docker/copy_configs.yml +++ b/roles/ceph-restapi/tasks/docker/copy_configs.yml @@ -11,8 +11,7 @@ become: false ignore_errors: true register: statconfig - tags: - - always + always_run: true - name: try to fetch ceph config and keys copy: diff --git a/roles/ceph-restapi/tasks/start_restapi.yml b/roles/ceph-restapi/tasks/start_restapi.yml index 7ee48bf20..1c4f23665 100644 --- a/roles/ceph-restapi/tasks/start_restapi.yml +++ b/roles/ceph-restapi/tasks/start_restapi.yml @@ -3,9 +3,8 @@ shell: "pgrep -f ceph-rest-api" changed_when: false failed_when: false + always_run: true register: restapi_status - tags: - - always - name: start ceph rest api shell: "nohup ceph-rest-api --conf /etc/ceph/{{ cluster }}.conf &" diff --git a/roles/ceph-rgw/tasks/docker/copy_configs.yml b/roles/ceph-rgw/tasks/docker/copy_configs.yml index 476f0dae2..46469f286 100644 --- a/roles/ceph-rgw/tasks/docker/copy_configs.yml +++ b/roles/ceph-rgw/tasks/docker/copy_configs.yml @@ -10,9 +10,8 @@ changed_when: false become: false ignore_errors: true + always_run: true register: statconfig - tags: - - always - name: try to fetch ceph config and keys copy: diff --git a/roles/ceph-rgw/tasks/multisite/checks.yml b/roles/ceph-rgw/tasks/multisite/checks.yml index cf54052cc..c8565b422 100644 --- a/roles/ceph-rgw/tasks/multisite/checks.yml +++ b/roles/ceph-rgw/tasks/multisite/checks.yml @@ -4,29 +4,25 @@ register: realmcheck failed_when: False changed_when: False - tags: - - always + 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 - tags: - - always + 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 - tags: - - always + 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 - tags: - - always + always_run: True diff --git a/tests/functional/rhcs_setup.yml b/tests/functional/rhcs_setup.yml index 7c12c6ff0..00f813103 100644 --- a/tests/functional/rhcs_setup.yml +++ b/tests/functional/rhcs_setup.yml @@ -53,8 +53,7 @@ stat: path: /run/ostree-booted register: stat_ostree - tags: - - always + always_run: true - name: set fact for using Atomic host set_fact: @@ -126,7 +125,7 @@ - name: set MTU on eth2 command: "ifconfig eth2 mtu 1400 up" -- hosts: mdss:rgws:clients +- hosts: mdss:rgws:clients gather_facts: false become: yes tasks: diff --git a/tests/functional/setup.yml b/tests/functional/setup.yml index e81173aac..881da2797 100644 --- a/tests/functional/setup.yml +++ b/tests/functional/setup.yml @@ -8,8 +8,7 @@ - name: check if it is Atomic host stat: path=/run/ostree-booted register: stat_ostree - tags: - - always + always_run: true - name: set fact for using Atomic host set_fact: -- 2.39.5