From: Major Hayden Date: Thu, 12 Oct 2017 13:29:41 +0000 (-0500) Subject: Avoid deprecated always_run X-Git-Tag: beta-3.1.0~120^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2037%2Fhead;p=ceph-ansible.git Avoid deprecated always_run The `always_run` key is deprecated and being removed in Ansible 2.4. Using it causes a warning to be displayed: [DEPRECATION WARNING]: always_run is deprecated. This patch changes all instances of `always_run` to use the `always` tag, which causes the task to run each time the playbook runs. --- diff --git a/roles/ceph-common-coreos/tasks/main.yml b/roles/ceph-common-coreos/tasks/main.yml index f858ae5fd..249a186fe 100644 --- a/roles/ceph-common-coreos/tasks/main.yml +++ b/roles/ceph-common-coreos/tasks/main.yml @@ -3,7 +3,8 @@ raw: stat $HOME/.python register: need_python ignore_errors: true - always_run: true + tags: + - always - include: install_pypy.yml when: need_python | failed @@ -12,7 +13,8 @@ raw: stat $HOME/.pip register: need_pip ignore_errors: true - always_run: true + tags: + - always - 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 458da0711..75378fea3 100644 --- a/roles/ceph-common/tasks/checks/check_firewall.yml +++ b/roles/ceph-common/tasks/checks/check_firewall.yml @@ -5,7 +5,8 @@ failed_when: false register: nmapexist run_once: true - always_run: true + tags: + - always - name: inform that nmap is not present debug: @@ -19,10 +20,11 @@ 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: @@ -37,10 +39,11 @@ 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: @@ -55,10 +58,11 @@ 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: @@ -73,10 +77,11 @@ 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: @@ -91,10 +96,11 @@ 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_ntp_atomic.yml b/roles/ceph-common/tasks/checks/check_ntp_atomic.yml index 32050835e..3fe88bcdc 100644 --- a/roles/ceph-common/tasks/checks/check_ntp_atomic.yml +++ b/roles/ceph-common/tasks/checks/check_ntp_atomic.yml @@ -3,5 +3,6 @@ command: rpm -q chrony register: ntp_pkg_query ignore_errors: true - always_run: true changed_when: false + tags: + - always diff --git a/roles/ceph-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-common/tasks/checks/check_ntp_debian.yml index c666958ca..1d537825b 100644 --- a/roles/ceph-common/tasks/checks/check_ntp_debian.yml +++ b/roles/ceph-common/tasks/checks/check_ntp_debian.yml @@ -3,10 +3,11 @@ 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-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml index 2a957b455..c3ab43be2 100644 --- a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml +++ b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml @@ -3,10 +3,11 @@ command: rpm -q ntp 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-common/tasks/checks/check_system.yml b/roles/ceph-common/tasks/checks/check_system.yml index 4e0be38cd..6d31d1277 100644 --- a/roles/ceph-common/tasks/checks/check_system.yml +++ b/roles/ceph-common/tasks/checks/check_system.yml @@ -30,11 +30,12 @@ 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 373a87eff..318746d98 100644 --- a/roles/ceph-common/tasks/configure_cluster_name.yml +++ b/roles/ceph-common/tasks/configure_cluster_name.yml @@ -22,9 +22,10 @@ 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 1b22afda4..b22cf4e17 100644 --- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml +++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml @@ -4,9 +4,10 @@ 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 @@ -20,9 +21,10 @@ 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 @@ -36,9 +38,10 @@ 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 765853047..535e13eb6 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -65,8 +65,9 @@ - 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 0aeced9ff..901d67910 100644 --- a/roles/ceph-common/tasks/misc/system_tuning.yml +++ b/roles/ceph-common/tasks/misc/system_tuning.yml @@ -33,8 +33,9 @@ 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 4a5df3350..d256e1eba 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -87,10 +87,11 @@ 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 856a4192c..4268c22fb 100644 --- a/roles/ceph-defaults/tasks/check_socket_container.yml +++ b/roles/ceph-defaults/tasks/check_socket_container.yml @@ -4,60 +4,67 @@ 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 4ad560ad0..d93125dd3 100644 --- a/roles/ceph-defaults/tasks/check_socket_non_container.yml +++ b/roles/ceph-defaults/tasks/check_socket_non_container.yml @@ -3,20 +3,22 @@ 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: @@ -32,20 +34,22 @@ 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: @@ -61,20 +65,22 @@ 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: @@ -90,20 +96,22 @@ 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: @@ -119,20 +127,22 @@ 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: @@ -148,20 +158,22 @@ 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: @@ -176,20 +188,22 @@ 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 3311f9e5b..98ad20706 100644 --- a/roles/ceph-defaults/tasks/facts.yml +++ b/roles/ceph-defaults/tasks/facts.yml @@ -18,12 +18,13 @@ 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 @@ -82,9 +83,10 @@ 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 32050835e..3fe88bcdc 100644 --- a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml +++ b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml @@ -3,5 +3,6 @@ command: rpm -q chrony 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 c666958ca..1d537825b 100644 --- a/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml +++ b/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml @@ -3,10 +3,11 @@ 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 2a957b455..c3ab43be2 100644 --- a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml +++ b/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml @@ -3,10 +3,11 @@ command: rpm -q ntp 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 81e95704b..48fc3a56c 100644 --- a/roles/ceph-docker-common/tasks/main.yml +++ b/roles/ceph-docker-common/tasks/main.yml @@ -6,7 +6,8 @@ stat: path: /run/ostree-booted register: stat_ostree - always_run: true + tags: + - always - name: set_fact is_atomic set_fact: @@ -33,8 +34,9 @@ - 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: @@ -51,7 +53,8 @@ register: ceph_health changed_when: false failed_when: false - always_run: true + tags: + - always - name: include checks.yml include: checks.yml @@ -89,8 +92,9 @@ - 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 8e74a6375..08651804b 100644 --- a/roles/ceph-docker-common/tasks/selinux.yml +++ b/roles/ceph-docker-common/tasks/selinux.yml @@ -3,4 +3,5 @@ command: getenforce register: sestatus changed_when: false - always_run: true + tags: + - always diff --git a/roles/ceph-docker-common/tasks/stat_ceph_files.yml b/roles/ceph-docker-common/tasks/stat_ceph_files.yml index ffd50b57f..ba4fd5ac0 100644 --- a/roles/ceph-docker-common/tasks/stat_ceph_files.yml +++ b/roles/ceph-docker-common/tasks/stat_ceph_files.yml @@ -34,5 +34,6 @@ become: false failed_when: false register: statconfig - always_run: true + tags: + - always diff --git a/roles/ceph-fetch-keys/tasks/main.yml b/roles/ceph-fetch-keys/tasks/main.yml index 917c42b2c..7ff09ef9a 100644 --- a/roles/ceph-fetch-keys/tasks/main.yml +++ b/roles/ceph-fetch-keys/tasks/main.yml @@ -3,7 +3,8 @@ shell: ls -1 /etc/ceph/*.keyring changed_when: false register: ceph_keys - always_run: true + tags: + - always - 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 c4df5830f..d8b8dd2b6 100644 --- a/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml +++ b/roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml @@ -12,8 +12,9 @@ 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 ead7d18fd..9057ae2fc 100644 --- a/roles/ceph-mds/tasks/containerized.yml +++ b/roles/ceph-mds/tasks/containerized.yml @@ -14,8 +14,9 @@ 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 d90ce7671..eedbff682 100644 --- a/roles/ceph-mgr/tasks/docker/copy_configs.yml +++ b/roles/ceph-mgr/tasks/docker/copy_configs.yml @@ -11,8 +11,9 @@ changed_when: false become: false failed_when: false - always_run: true register: statconfig + tags: + - always - name: try to fetch ceph config and keys copy: @@ -30,9 +31,10 @@ - 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 c778a27fa..1a6c35d71 100644 --- a/roles/ceph-mon/tasks/ceph_keys.yml +++ b/roles/ceph-mon/tasks/ceph_keys.yml @@ -4,18 +4,20 @@ 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 @@ -42,19 +44,21 @@ 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 @@ -87,9 +91,10 @@ 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 c4706e37e..175bd9084 100644 --- a/roles/ceph-mon/tasks/deploy_monitors.yml +++ b/roles/ceph-mon/tasks/deploy_monitors.yml @@ -12,8 +12,9 @@ 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 dad616f61..e3f6c6014 100644 --- a/roles/ceph-mon/tasks/docker/copy_configs.yml +++ b/roles/ceph-mon/tasks/docker/copy_configs.yml @@ -47,7 +47,8 @@ become: false failed_when: false register: statconfig - always_run: true + tags: + - always - 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 081625603..9a3b1fe26 100644 --- a/roles/ceph-mon/tasks/docker/main.yml +++ b/roles/ceph-mon/tasks/docker/main.yml @@ -110,9 +110,10 @@ 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 893c98ab6..e0dfbb9f6 100644 --- a/roles/ceph-mon/tasks/secure_cluster.yml +++ b/roles/ceph-mon/tasks/secure_cluster.yml @@ -2,7 +2,8 @@ - name: collect all the pools command: rados --cluster {{ cluster }} lspools register: ceph_pools - always_run: true + tags: + - always - 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 0aa3c66ed..04da5c82e 100644 --- a/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml +++ b/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml @@ -4,7 +4,8 @@ register: selinuxstatus changed_when: false failed_when: false - always_run: true + tags: + - always - 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 142b9a38b..bde0882d9 100644 --- a/roles/ceph-nfs/tasks/pre_requisite_container.yml +++ b/roles/ceph-nfs/tasks/pre_requisite_container.yml @@ -10,8 +10,9 @@ 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 d4aaaa338..72f38b158 100644 --- a/roles/ceph-osd/tasks/check_devices.yml +++ b/roles/ceph-osd/tasks/check_devices.yml @@ -42,10 +42,11 @@ - "{{ 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 3a4ca7934..060528b20 100644 --- a/roles/ceph-osd/tasks/check_devices_static.yml +++ b/roles/ceph-osd/tasks/check_devices_static.yml @@ -5,8 +5,9 @@ - "{{ 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 616e6d28c..ec53866d2 100644 --- a/roles/ceph-osd/tasks/copy_configs.yml +++ b/roles/ceph-osd/tasks/copy_configs.yml @@ -15,8 +15,9 @@ 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 e54a27871..afc42af99 100644 --- a/roles/ceph-osd/tasks/main.yml +++ b/roles/ceph-osd/tasks/main.yml @@ -40,8 +40,9 @@ - "{{ 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 f7e71d6cc..df60e815c 100644 --- a/roles/ceph-osd/tasks/osd_fragment.yml +++ b/roles/ceph-osd/tasks/osd_fragment.yml @@ -4,16 +4,18 @@ 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 da140bd07..5419d1d37 100644 --- a/roles/ceph-osd/tasks/start_osds.yml +++ b/roles/ceph-osd/tasks/start_osds.yml @@ -4,10 +4,11 @@ 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 581087db3..5c7944591 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml @@ -17,9 +17,10 @@ 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 cc8ea7f8d..ca7d6c18e 100644 --- a/roles/ceph-restapi/tasks/docker/copy_configs.yml +++ b/roles/ceph-restapi/tasks/docker/copy_configs.yml @@ -11,7 +11,8 @@ become: false ignore_errors: true register: statconfig - always_run: true + tags: + - always - 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 1c4f23665..7ee48bf20 100644 --- a/roles/ceph-restapi/tasks/start_restapi.yml +++ b/roles/ceph-restapi/tasks/start_restapi.yml @@ -3,8 +3,9 @@ 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 46469f286..476f0dae2 100644 --- a/roles/ceph-rgw/tasks/docker/copy_configs.yml +++ b/roles/ceph-rgw/tasks/docker/copy_configs.yml @@ -10,8 +10,9 @@ 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 c8565b422..cf54052cc 100644 --- a/roles/ceph-rgw/tasks/multisite/checks.yml +++ b/roles/ceph-rgw/tasks/multisite/checks.yml @@ -4,25 +4,29 @@ register: realmcheck failed_when: False changed_when: False - always_run: True + tags: + - always - 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 + tags: + - always - 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 + tags: + - always - 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 + tags: + - always diff --git a/tests/functional/rhcs_setup.yml b/tests/functional/rhcs_setup.yml index 00f813103..7c12c6ff0 100644 --- a/tests/functional/rhcs_setup.yml +++ b/tests/functional/rhcs_setup.yml @@ -53,7 +53,8 @@ stat: path: /run/ostree-booted register: stat_ostree - always_run: true + tags: + - always - name: set fact for using Atomic host set_fact: @@ -125,7 +126,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 881da2797..e81173aac 100644 --- a/tests/functional/setup.yml +++ b/tests/functional/setup.yml @@ -8,7 +8,8 @@ - name: check if it is Atomic host stat: path=/run/ostree-booted register: stat_ostree - always_run: true + tags: + - always - name: set fact for using Atomic host set_fact: