don't use "include" to include tasks

Use "import_tasks" or "include_tasks" instead.

Signed-off-by: Rishabh Dave <ridave@redhat.com>

diff --git a/infrastructure-playbooks/untested-by-ci/purge-multisite.yml b/infrastructure-playbooks/untested-by-ci/purge-multisite.yml
index 8b78553ac58c078916dc74acd046ba138387e5b9..c17500e52202492ca3097260698a750a5bd5a905 100644 (file)
--- a/infrastructure-playbooks/untested-by-ci/purge-multisite.yml
+++ b/infrastructure-playbooks/untested-by-ci/purge-multisite.yml
@@ -3,7 +3,7 @@
 - hosts: rgws
   become: True
   tasks:
-  - include: roles/ceph-rgw/tasks/multisite/destroy.yml
+  - include_tasks: roles/ceph-rgw/tasks/multisite/destroy.yml
 
   handlers:
   - include: roles/ceph-rgw/handlers/main.yml

diff --git a/roles/ceph-agent/tasks/main.yml b/roles/ceph-agent/tasks/main.yml
index 9f715976658b7fad1b194f1d04537c0533808cd3..2c252c96a50c3c46ac0d434b8de883593afd9480 100644 (file)
--- a/roles/ceph-agent/tasks/main.yml
+++ b/roles/ceph-agent/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: include pre_requisite.yml
-  include: pre_requisite.yml
+  include_tasks: pre_requisite.yml
 
 - name: include start_agent.yml
-  include: start_agent.yml
+  include_tasks: start_agent.yml

diff --git a/roles/ceph-client/tasks/main.yml b/roles/ceph-client/tasks/main.yml
index 3a03bfe5d905c539b0cd90dbf7905adb633d784d..87ea5fd700601de99d818215d495728d0e6bb731 100644 (file)
--- a/roles/ceph-client/tasks/main.yml
+++ b/roles/ceph-client/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: include pre_requisite.yml
-  include: pre_requisite.yml
+  include_tasks: pre_requisite.yml
 
 - name: include create_users_keys.yml
-  include: create_users_keys.yml
+  include_tasks: create_users_keys.yml
   when:
     - user_config

diff --git a/roles/ceph-common-coreos/tasks/main.yml b/roles/ceph-common-coreos/tasks/main.yml
index b0992e802fbab13705c074c4c99097729401a63d..38ae82ce68b3e81a9222e64a2fd234a129468fb2 100644 (file)
--- a/roles/ceph-common-coreos/tasks/main.yml
+++ b/roles/ceph-common-coreos/tasks/main.yml
@@ -5,7 +5,7 @@
   ignore_errors: true
   check_mode: no
 
-- include: install_pypy.yml
+- include_tasks: install_pypy.yml
   when: need_python | failed
 
 - name: check if there is pip
@@ -14,5 +14,5 @@
   ignore_errors: true
   check_mode: no
 
-- include: install_pip.yml
+- include_tasks: install_pip.yml
   when: need_pip | failed and need_python | failed

diff --git a/roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml b/roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml
index 466f262830b1e9e13c0b7b8cb8a2dc76a64e7573..59e6aa2f3137c7cdfd7725603b5959fa0a77be56 100644 (file)
--- a/roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml
+++ b/roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml
@@ -1,26 +1,26 @@
 ---
 - name: include debian_community_repository.yml
-  include: debian_community_repository.yml
+  include_tasks: debian_community_repository.yml
   when:
     - ceph_repository == 'community'
 
 - name: include debian_rhcs_repository.yml
-  include: debian_rhcs_repository.yml
+  include_tasks: debian_rhcs_repository.yml
   when:
     - ceph_repository == 'rhcs'
 
 - name: include debian_dev_repository.yml
-  include: debian_dev_repository.yml
+  include_tasks: debian_dev_repository.yml
   when:
     - ceph_repository == 'dev'
 
 - name: include debian_custom_repository.yml
-  include: debian_custom_repository.yml
+  include_tasks: debian_custom_repository.yml
   when:
     - ceph_repository == 'custom'
 
 - name: include debian_uca_repository.yml
-  include: debian_uca_repository.yml
+  include_tasks: debian_uca_repository.yml
   when:
     - ceph_repository == 'uca'
 

diff --git a/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml b/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml
index 74f18bc66345c64d5dea5663a87215d8fddefdf6..b0190df7fe2228e8bb340701d927b818cdd57ae0 100644 (file)
--- a/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml
+++ b/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml
@@ -1,21 +1,21 @@
 ---
 - name: include redhat_community_repository.yml
-  include: redhat_community_repository.yml
+  include_tasks: redhat_community_repository.yml
   when:
     - ceph_repository == 'community'
 
 - name: include redhat_rhcs_repository.yml
-  include: redhat_rhcs_repository.yml
+  include_tasks: redhat_rhcs_repository.yml
   when:
     - ceph_repository == 'rhcs'
 
 - name: include redhat_dev_repository.yml
-  include: redhat_dev_repository.yml
+  include_tasks: redhat_dev_repository.yml
   when:
     - ceph_repository == 'dev'
 
 - name: include redhat_custom_repository.yml
-  include: redhat_custom_repository.yml
+  include_tasks: redhat_custom_repository.yml
   when:
     - ceph_repository == 'custom'
 

diff --git a/roles/ceph-common/tasks/installs/configure_suse_repository_installation.yml b/roles/ceph-common/tasks/installs/configure_suse_repository_installation.yml
index 15665aa909629153c3d1b57d262bb2863d2f5557..1e23e3ed3c3784093a68eb63a1fdb320cb75bfa5 100644 (file)
--- a/roles/ceph-common/tasks/installs/configure_suse_repository_installation.yml
+++ b/roles/ceph-common/tasks/installs/configure_suse_repository_installation.yml
@@ -1,5 +1,5 @@
 ---
 - name: include suse_obs_repository.yml
-  include: suse_obs_repository.yml
+  include_tasks: suse_obs_repository.yml
   when:
     - ceph_repository == 'obs'

diff --git a/roles/ceph-common/tasks/installs/debian_rhcs_repository.yml b/roles/ceph-common/tasks/installs/debian_rhcs_repository.yml
index f381be077d677979d551010eb17ff64a3ce1c42f..4638a991e701cbc34c2b7f99bed82a6b58c7ef5c 100644 (file)
--- a/roles/ceph-common/tasks/installs/debian_rhcs_repository.yml
+++ b/roles/ceph-common/tasks/installs/debian_rhcs_repository.yml
@@ -8,11 +8,11 @@
     mode: 0644
 
 - name: include prerequisite_rhcs_iso_install_debian.yml
-  include: prerequisite_rhcs_iso_install_debian.yml
+  include_tasks: prerequisite_rhcs_iso_install_debian.yml
   when:
     - ceph_repository_type == 'iso'
 
 - name: include prerequisite_rhcs_cdn_install_debian.yml
-  include: prerequisite_rhcs_cdn_install_debian.yml
+  include_tasks: prerequisite_rhcs_cdn_install_debian.yml
   when:
     - ceph_repository_type == 'cdn'

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index e607975876a8f0c605487dd5906daca829664157..9b8471ba14afe6f79a0994de6bf51b73a9998b34 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -1,6 +1,6 @@
 ---
 - name: include configure_debian_repository_installation.yml
-  include: configure_debian_repository_installation.yml
+  include_tasks: configure_debian_repository_installation.yml
   when:
     - ceph_origin == 'repository'
 
@@ -28,13 +28,13 @@
     cache_valid_time: 3600
 
 - name: include install_debian_packages.yml
-  include: install_debian_packages.yml
+  include_tasks: install_debian_packages.yml
   when:
     - (ceph_origin == 'repository' or ceph_origin == 'distro')
     - ceph_repository != 'rhcs'
 
 - name: include install_debian_rhcs_packages.yml
-  include: install_debian_rhcs_packages.yml
+  include_tasks: install_debian_rhcs_packages.yml
   when:
     - (ceph_origin == 'repository' or ceph_origin == 'distro')
     - ceph_repository == 'rhcs'

diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index 3ddb88ef0a2aad918fc3f0ef56db57435e49a044..52e4eb0e79bd9817c882c6f96b15962b3b7655b2 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -1,15 +1,15 @@
 ---
 - name: include configure_redhat_repository_installation.yml
-  include: configure_redhat_repository_installation.yml
+  include_tasks: configure_redhat_repository_installation.yml
   when:
     - ceph_origin == 'repository'
 
 - name: include configure_redhat_local_installation.yml
-  include: configure_redhat_local_installation.yml
+  include_tasks: configure_redhat_local_installation.yml
   when:
     - ceph_origin == 'local'
 
 - name: include install_redhat_packages.yml
-  include: install_redhat_packages.yml
+  include_tasks: install_redhat_packages.yml
   when:
     - (ceph_origin == 'repository' or ceph_origin == 'distro')

diff --git a/roles/ceph-common/tasks/installs/install_on_suse.yml b/roles/ceph-common/tasks/installs/install_on_suse.yml
index 57b4a2ef2f73358babb7794b44d36153113ca82f..c8921a68ee30da1391a6b7360e77151c980daca4 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_suse.yml
+++ b/roles/ceph-common/tasks/installs/install_on_suse.yml
@@ -9,7 +9,7 @@
     - ceph_origin != 'distro' or (ceph_origin == 'repository' and ceph_repository != 'obs')
 
 - name: include configure_suse_repository_installation.yml
-  include: configure_suse_repository_installation.yml
+  include_tasks: configure_suse_repository_installation.yml
   when:
     - ceph_origin == 'repository'
 
@@ -21,4 +21,4 @@
   with_items: "{{ suse_package_dependencies }}"
 
 - name: include install_suse_packages.yml
-  include: install_suse_packages.yml
+  include_tasks: install_suse_packages.yml

diff --git a/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml b/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml
index 3fdac2b057f1ce18534a8375daf3badff84705a1..cfb5e481a5cccf3bb1fcecf7bded461d0a41e232 100644 (file)
--- a/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml
+++ b/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml
@@ -1,10 +1,10 @@
 ---
 - name: include prerequisite_rhcs_iso_install.yml
-  include: prerequisite_rhcs_iso_install.yml
+  include_tasks: prerequisite_rhcs_iso_install.yml
   when:
     - ceph_repository_type == 'iso'
 
 - name: include prerequisite_rhcs_cdn_install.yml
-  include: prerequisite_rhcs_cdn_install.yml
+  include_tasks: prerequisite_rhcs_cdn_install.yml
   when:
     - ceph_repository_type == 'cdn'

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index c485dd6d34ef1fe50f7973be8981924045870bf1..9a024246f822b1a1f556afbfea3d578c8a5b9e46 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -63,7 +63,7 @@
 
 # override ceph_stable_release for ceph_dev and rhcs installations since ceph_stable_release is not mandatory
 - name: include release-rhcs.yml
-  include: release-rhcs.yml
+  include_tasks: release-rhcs.yml
   when:
     - ceph_repository in ['rhcs', 'dev']
   tags:
@@ -85,7 +85,7 @@
   static: False
 
 - name: include facts_mon_fsid.yml
-  include: facts_mon_fsid.yml
+  include_tasks: facts_mon_fsid.yml
   run_once: true
   when:
     - cephx
@@ -94,13 +94,13 @@
     - ceph_current_status.fsid is defined
 
 - name: include create_rbd_client_dir.yml
-  include: create_rbd_client_dir.yml
+  include_tasks: create_rbd_client_dir.yml
 
 - name: include configure_cluster_name.yml
-  include: configure_cluster_name.yml
+  include_tasks: configure_cluster_name.yml
 
 - name: include configure_memory_allocator.yml
-  include: configure_memory_allocator.yml
+  include_tasks: configure_memory_allocator.yml
   when:
     - (ceph_tcmalloc_max_total_thread_cache | int) > 0
     - osd_objectstore == 'filestore'

diff --git a/roles/ceph-defaults/tasks/check_running_cluster.yml b/roles/ceph-defaults/tasks/check_running_cluster.yml
index b41e42f1fff5a657f41bf5cb76addc3d7acc9559..0418d2ffed4b34ef3d06de49c7b2e17ccfeb550e 100644 (file)
--- a/roles/ceph-defaults/tasks/check_running_cluster.yml
+++ b/roles/ceph-defaults/tasks/check_running_cluster.yml
@@ -1,10 +1,10 @@
 ---
 - name: include check_running_containers.yml
-  include: check_running_containers.yml
+  include_tasks: check_running_containers.yml
   when:
     - containerized_deployment
 
 - name: include check_socket_non_container.yml
-  include: check_socket_non_container.yml
+  include_tasks: check_socket_non_container.yml
   when:
     - not containerized_deployment

diff --git a/roles/ceph-defaults/tasks/main.yml b/roles/ceph-defaults/tasks/main.yml
index 112c37c7709d11f18c9ec9e6fe6d0d71f21f816e..3559ee8bdb518c941b2ad1eba5ecaf2bcf78c3af 100644 (file)
--- a/roles/ceph-defaults/tasks/main.yml
+++ b/roles/ceph-defaults/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: include check_running_cluster.yml
-  include: check_running_cluster.yml
+  include_tasks: check_running_cluster.yml
 
 - name: include facts.yml
-  include: facts.yml
+  include_tasks: facts.yml
 
 - name: include create_ceph_initial_dirs.yml
-  include: create_ceph_initial_dirs.yml
\ No newline at end of file
+  include_tasks: create_ceph_initial_dirs.yml

diff --git a/roles/ceph-docker-common/tasks/checks.yml b/roles/ceph-docker-common/tasks/checks.yml
index f96d90635d351846b85a151b5fd0f2d90b7dc94e..b892cc6422557c0836c75e0fb8dee5845830d962 100644 (file)
--- a/roles/ceph-docker-common/tasks/checks.yml
+++ b/roles/ceph-docker-common/tasks/checks.yml
@@ -1,6 +1,6 @@
 ---
 - name: include stat_ceph_files.yml
-  include: stat_ceph_files.yml
+  include_tasks: stat_ceph_files.yml
 
 - name: fail if we find existing cluster files
   fail:

diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml
index 13ff5270d1e9fad03b7e06a66500327d5644019c..d0110c8a70881215c581543ddbefa433d5156d15 100644 (file)
--- a/roles/ceph-docker-common/tasks/main.yml
+++ b/roles/ceph-docker-common/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 - name: include system_checks.yml
-  include: system_checks.yml
+  include_tasks: system_checks.yml
 
 - name: include check_mandatory_vars.yml
-  include: check_mandatory_vars.yml
+  include_tasks: check_mandatory_vars.yml
 
 - name: include pre_requisites/prerequisites.yml
-  include: pre_requisites/prerequisites.yml
+  include_tasks: pre_requisites/prerequisites.yml
   when:
     - not is_atomic
 
@@ -47,7 +47,7 @@
   check_mode: no
 
 - name: include checks.yml
-  include: checks.yml
+  include_tasks: checks.yml
   when:
     - (not containerized_deployment_with_kv and
        ((inventory_hostname in groups.get(mon_group_name, [])) or
@@ -57,27 +57,27 @@
     - not rolling_update | default(false)
 
 - name: include misc/ntp_atomic.yml
-  include: misc/ntp_atomic.yml
+  include_tasks: misc/ntp_atomic.yml
   when:
     - is_atomic
     - ansible_os_family == 'RedHat'
     - ntp_service_enabled
 
 - name: include misc/ntp_rpm.yml
-  include: misc/ntp_rpm.yml
+  include_tasks: misc/ntp_rpm.yml
   when:
     - not is_atomic
     - ansible_os_family in ['RedHat', 'Suse']
     - ntp_service_enabled
 
 - name: include misc/ntp_debian.yml
-  include: misc/ntp_debian.yml
+  include_tasks: misc/ntp_debian.yml
   when:
     - ansible_os_family == 'Debian'
     - ntp_service_enabled
 
 - name: include fetch_image.yml
-  include: fetch_image.yml
+  include_tasks: fetch_image.yml
   tags:
     - fetch_container_image
 
@@ -92,9 +92,9 @@
     ceph_version: "{{ ceph_version.stdout.split(' ')[2] }}"
 
 - name: include release.yml
-  include: release.yml
+  include_tasks: release.yml
 
 # NOTE (jimcurtis): dirs_permissions.yml must precede fetch_configs.yml
 # # because it creates the directories needed by the latter.
 - name: include dirs_permissions.yml
-  include: dirs_permissions.yml
+  include_tasks: dirs_permissions.yml

diff --git a/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml b/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
index b8a7534506777a872eda2e145628811bca029e9a..fe6e268cfcbcc3b56df17f375da54c9e1ddeb4d7 100644 (file)
--- a/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
+++ b/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
@@ -1,6 +1,6 @@
 ---
 - name: include ../checks/check_ntp_atomic.yml
-  include: ../checks/check_ntp_atomic.yml
+  include_tasks: ../checks/check_ntp_atomic.yml
   when: is_atomic
 
 - name: start the ntp service

diff --git a/roles/ceph-docker-common/tasks/misc/ntp_debian.yml b/roles/ceph-docker-common/tasks/misc/ntp_debian.yml
index 7eab2e410fd448cc561f54b9363249d95e694864..6441daa408ef987cc7a514a184dbbbb2cd449822 100644 (file)
--- a/roles/ceph-docker-common/tasks/misc/ntp_debian.yml
+++ b/roles/ceph-docker-common/tasks/misc/ntp_debian.yml
@@ -1,6 +1,6 @@
 ---
 - name: include ../checks/check_ntp_debian.yml
-  include: ../checks/check_ntp_debian.yml
+  include_tasks: ../checks/check_ntp_debian.yml
   when:
     - ansible_os_family == 'Debian'
 

diff --git a/roles/ceph-docker-common/tasks/misc/ntp_rpm.yml b/roles/ceph-docker-common/tasks/misc/ntp_rpm.yml
index 5384604eb8faa001dc43ad8bdce4f864266edecc..6f2a58a578ed478a7313e341ffce2302356dcfb5 100644 (file)
--- a/roles/ceph-docker-common/tasks/misc/ntp_rpm.yml
+++ b/roles/ceph-docker-common/tasks/misc/ntp_rpm.yml
@@ -1,6 +1,6 @@
 ---
 - name: include ../checks/check_ntp_rpm.yml
-  include: ../checks/check_ntp_rpm.yml
+  include_tasks: ../checks/check_ntp_rpm.yml
   when:
     - ansible_os_family in ['RedHat', 'Suse']
 

diff --git a/roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml b/roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml
index 02dd814d642aacd617bb00d80fdf027fdfaf2f82..1124264e16de222ad09d5d7709f65aca3c33b791 100644 (file)
--- a/roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml
+++ b/roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml
@@ -1,9 +1,9 @@
 ---
 - name: include remove_ceph_udev_rules.yml
-  include: remove_ceph_udev_rules.yml
+  include_tasks: remove_ceph_udev_rules.yml
 
 - name: include debian_prerequisites.yml
-  include: debian_prerequisites.yml
+  include_tasks: debian_prerequisites.yml
   when:
     - ansible_distribution == 'Debian'
   tags:

diff --git a/roles/ceph-iscsi-gw/tasks/main.yml b/roles/ceph-iscsi-gw/tasks/main.yml
index f498122c7c8c4165d86244dc050c3438e095b2ba..77cfe618e19ff633974aebcd46b75f78ace1eabf 100644 (file)
--- a/roles/ceph-iscsi-gw/tasks/main.yml
+++ b/roles/ceph-iscsi-gw/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: include common.yml
-  include: common.yml
+  include_tasks: common.yml
 
 - name: include non-container/prerequisites.yml
-  include: non-container/prerequisites.yml
+  include_tasks: non-container/prerequisites.yml
   when:
     - not containerized_deployment
 
@@ -11,16 +11,16 @@
 # and transfers them to /etc/ceph directory on each controller. SSL certs are used by
 # the API for https support.
 - name: include deploy_ssl_keys.yml
-  include: deploy_ssl_keys.yml
+  include_tasks: deploy_ssl_keys.yml
   when:
     - generate_crt|bool
 
 - name: include non-container/configure_iscsi.yml
-  include: non-container/configure_iscsi.yml
+  include_tasks: non-container/configure_iscsi.yml
   when:
     - not containerized_deployment
 
 - name: include containerized.yml
-  include: container/containerized.yml
+  include_tasks: container/containerized.yml
   when:
     - containerized_deployment

diff --git a/roles/ceph-mds/tasks/main.yml b/roles/ceph-mds/tasks/main.yml
index d012751ea1257b7f0baff09c8ef22e5c3896945f..a63297199eff842a15d692933993804de8f7aa00 100644 (file)
--- a/roles/ceph-mds/tasks/main.yml
+++ b/roles/ceph-mds/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: include create_mds_filesystems.yml
-  include: create_mds_filesystems.yml
+  include_tasks: create_mds_filesystems.yml
   when:
     - inventory_hostname == groups[mds_group_name] | first
 
@@ -11,12 +11,12 @@
     - containerized_deployment
 
 - name: include common.yml
-  include: common.yml
+  include_tasks: common.yml
 
 - name: non_containerized.yml
-  include: non_containerized.yml
+  include_tasks: non_containerized.yml
   when: not containerized_deployment
 
 - name: containerized.yml
-  include: containerized.yml
+  include_tasks: containerized.yml
   when: containerized_deployment

diff --git a/roles/ceph-mgr/tasks/docker/main.yml b/roles/ceph-mgr/tasks/docker/main.yml
index 257c62c1dd6c474a6c15279e5f96fadf33d164ee..1737f1b6f66d5ee4e0b85c56a35e6c966ace7080 100644 (file)
--- a/roles/ceph-mgr/tasks/docker/main.yml
+++ b/roles/ceph-mgr/tasks/docker/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: include start_docker_mgr.yml
-  include: start_docker_mgr.yml
+  include_tasks: start_docker_mgr.yml

diff --git a/roles/ceph-mgr/tasks/main.yml b/roles/ceph-mgr/tasks/main.yml
index a2eda822d1fa3942f0ca01fce325a2fdb2e4465f..410fa1d9a9750e82e80fa92e2a1d6ce38c3a555c 100644 (file)
--- a/roles/ceph-mgr/tasks/main.yml
+++ b/roles/ceph-mgr/tasks/main.yml
@@ -6,14 +6,14 @@
     - containerized_deployment
 
 - name: include common.yml
-  include: common.yml
+  include_tasks: common.yml
 
 - name: include pre_requisite.yml
-  include: pre_requisite.yml
+  include_tasks: pre_requisite.yml
   when: not containerized_deployment
 
 - name: include docker/main.yml
-  include: docker/main.yml
+  include_tasks: docker/main.yml
   when: containerized_deployment
 
 - name: get enabled modules from ceph-mgr

diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 88273f42a2757d7cf6c174672826a107eb70684c..5703761c7b0b7aa38a6d37040b618f9c46aba2d8 100644 (file)
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -1,13 +1,13 @@
 ---
 - name: include copy_configs.yml
-  include: copy_configs.yml
+  include_tasks: copy_configs.yml
   when: not containerized_deployment_with_kv
 
 - name: include start_docker_monitor.yml
-  include: start_docker_monitor.yml
+  include_tasks: start_docker_monitor.yml
 
 - name: include configure_ceph_command_aliases.yml
-  include: configure_ceph_command_aliases.yml
+  include_tasks: configure_ceph_command_aliases.yml
 
 - name: wait for monitor socket to exist
   command: "{{ docker_exec_cmd }} sh -c 'stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_hostname }}.asok || stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_fqdn }}.asok'"
@@ -77,7 +77,7 @@
     - hostvars[groups[mon_group_name][0]]['monitor_address_block'] != 'subnet'
 
 - name: include fetch_configs.yml
-  include: fetch_configs.yml
+  include_tasks: fetch_configs.yml
   run_once: true
   when: not containerized_deployment_with_kv
 

diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index 1b212f77dda370060eda7b642de87a36e4032a3e..3cf192d09dc47a4c2a527ba435f597f99ccad2b1 100644 (file)
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -6,11 +6,11 @@
     - containerized_deployment
 
 - name: include deploy_monitors.yml
-  include: deploy_monitors.yml
+  include_tasks: deploy_monitors.yml
   when: not containerized_deployment
 
 - name: include start_monitor.yml
-  include: start_monitor.yml
+  import_tasks: start_monitor.yml
   when: not containerized_deployment
 
 - name: include ceph_keys.yml
@@ -20,7 +20,7 @@
   static: no
 
 - name: include secure_cluster.yml
-  include: secure_cluster.yml
+  include_tasks: secure_cluster.yml
   delegate_to: "{{ groups[mon_group_name][0] }}"
   run_once: true
   when:
@@ -28,17 +28,17 @@
     - not containerized_deployment
 
 - name: include docker/main.yml
-  include: docker/main.yml
+  include_tasks: docker/main.yml
   when: containerized_deployment
 
 - name: crush_rules.yml
-  include: crush_rules.yml
+  include_tasks: crush_rules.yml
   when:
     - crush_rule_config
 
 - name: include set_osd_pool_default_pg_num.yml
-  include: set_osd_pool_default_pg_num.yml
+  include_tasks: set_osd_pool_default_pg_num.yml
 
 - name: include calamari.yml
-  include: calamari.yml
+  include_tasks: calamari.yml
   when: calamari

diff --git a/roles/ceph-nfs/tasks/main.yml b/roles/ceph-nfs/tasks/main.yml
index efa59f627cbee0d8e92989763c4b0e424c734f41..83482d35e5d385fe6ece37106e93d1e34ca4c6d9 100644 (file)
--- a/roles/ceph-nfs/tasks/main.yml
+++ b/roles/ceph-nfs/tasks/main.yml
@@ -6,28 +6,28 @@
     - containerized_deployment
 
 - name: include common.yml
-  include: common.yml
+  include_tasks: common.yml
 
 - name: include pre_requisite_non_container.yml
-  include: pre_requisite_non_container.yml
+  include_tasks: pre_requisite_non_container.yml
   when:
     - not containerized_deployment
 
 - name: include pre_requisite_container.yml
-  include: pre_requisite_container.yml
+  include_tasks: pre_requisite_container.yml
   when:
     - containerized_deployment
 
 - name: include create_rgw_nfs_user.yml
-  include: create_rgw_nfs_user.yml
+  import_tasks: create_rgw_nfs_user.yml
 
 # NOTE (leseb): workaround for issues with ganesha and librgw
 - name: include ganesha_selinux_fix.yml
-  include: ganesha_selinux_fix.yml
+  import_tasks: ganesha_selinux_fix.yml
   when:
     - not containerized_deployment
     - ansible_os_family == 'RedHat'
     - ansible_distribution_version >= '7.4'
 
 - name: include start_nfs.yml
-  include: start_nfs.yml
+  import_tasks: start_nfs.yml

diff --git a/roles/ceph-osd/tasks/docker/main.yml b/roles/ceph-osd/tasks/docker/main.yml
index fde59c2d8f1a4eb2eddc2fa1eb567aa923d0bf8e..91b56ceb2b8780eeb7ef9b05139a4bbe541f279b 100644 (file)
--- a/roles/ceph-osd/tasks/docker/main.yml
+++ b/roles/ceph-osd/tasks/docker/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: include start_docker_osd.yml
-  include: start_docker_osd.yml
+  include_tasks: start_docker_osd.yml

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index 01e23e80100b550fbd0aeb2b753a420580eb1cca..15399c72a429a04e8db688fd53fc10c65c142cf1 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -18,10 +18,10 @@
   static: False
 
 - name: include ceph_disk_cli_options_facts.yml
-  include: ceph_disk_cli_options_facts.yml
+  include_tasks: ceph_disk_cli_options_facts.yml
 
 - name: include build_devices.yml
-  include: build_devices.yml
+  include_tasks: build_devices.yml
 
 - name: read information about the devices
   parted:
@@ -31,7 +31,7 @@
   with_items: "{{ devices }}"
 
 - name: include check_gpt.yml
-  include: check_gpt.yml
+  include_tasks: check_gpt.yml
   when:
     - osd_scenario != 'lvm'
 
@@ -107,7 +107,7 @@
 
 # Create the pools listed in openstack_pools
 - name: include openstack_config.yml
-  include: openstack_config.yml
+  include_tasks: openstack_config.yml
   when:
     - openstack_config
     - inventory_hostname == groups[osd_group_name] | last

diff --git a/roles/ceph-rbd-mirror/tasks/docker/main.yml b/roles/ceph-rbd-mirror/tasks/docker/main.yml
index 8368f9ff2576689734f585e45392fa5dff993cf4..8c2e8a866e3db56b8e1be739eacff85abb5c8f48 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/docker/main.yml
+++ b/roles/ceph-rbd-mirror/tasks/docker/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: include start_docker_rbd_mirror.yml
-  include: start_docker_rbd_mirror.yml
+  include_tasks: start_docker_rbd_mirror.yml

diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml
index 526ae59ac52ac08a6093cf330954a376bb052984..82a33975ddbc1405ee9aa4de6baf9b08af8ab2fe 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/main.yml
+++ b/roles/ceph-rbd-mirror/tasks/main.yml
@@ -6,25 +6,25 @@
     - containerized_deployment
 
 - name: include common.yml
-  include: common.yml
+  include_tasks: common.yml
 
 - name: include pre_requisite.yml
-  include: pre_requisite.yml
+  include_tasks: pre_requisite.yml
   when:
     - not containerized_deployment
 
 - name: include start_rbd_mirror.yml
-  include: start_rbd_mirror.yml
+  include_tasks: start_rbd_mirror.yml
   when:
     - not containerized_deployment
 
 - name: include configure_mirroring.yml
-  include: configure_mirroring.yml
+  include_tasks: configure_mirroring.yml
   when:
     - ceph_rbd_mirror_configure
     - not containerized_deployment
 
 - name: include docker/main.yml
-  include: docker/main.yml
+  include_tasks: docker/main.yml
   when:
     - containerized_deployment

diff --git a/roles/ceph-restapi/tasks/docker/main.yml b/roles/ceph-restapi/tasks/docker/main.yml
index 0e992d15db0eec750bda067e767be737d157920c..71ce252c2d3ab2abcb83f3d37ffc2d083348b363 100644 (file)
--- a/roles/ceph-restapi/tasks/docker/main.yml
+++ b/roles/ceph-restapi/tasks/docker/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: include copy_configs.yml
-  include: copy_configs.yml
+  include_tasks: copy_configs.yml
 
 - name: include start_docker_restapi.yml
-  include: start_docker_restapi.yml
+  include_tasks: start_docker_restapi.yml

diff --git a/roles/ceph-restapi/tasks/main.yml b/roles/ceph-restapi/tasks/main.yml
index 851b78ea09a9dadfc90dabb82db4c1debc3f8e23..585bae63d1357d1c2ffa87d3b6707fb0edd6a04a 100644 (file)
--- a/roles/ceph-restapi/tasks/main.yml
+++ b/roles/ceph-restapi/tasks/main.yml
@@ -6,16 +6,16 @@
     - containerized_deployment
 
 - name: include pre_requisite.yml
-  include: pre_requisite.yml
+  include_tasks: pre_requisite.yml
   when:
     - not containerized_deployment
 
 - name: include start_restapi.yml
-  include: start_restapi.yml
+  include_tasks: start_restapi.yml
   when:
     - not containerized_deployment
 
 - name: include docker/main.yml
-  include: docker/main.yml
+  include_tasks: docker/main.yml
   when:
     - containerized_deployment

diff --git a/roles/ceph-rgw/tasks/docker/main.yml b/roles/ceph-rgw/tasks/docker/main.yml
index 0928e5739ff221a26e7471d518bfb8a6c135061e..539c42303ede66cb42b08707deef660d51747be1 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/main.yml
+++ b/roles/ceph-rgw/tasks/docker/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: include start_docker_rgw.yml
-  include: start_docker_rgw.yml
+  include_tasks: start_docker_rgw.yml

diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml
index 5641407ba2e984ff078b51a7ded470f0b6625c4b..9abb84424f5c28dec9dda01fae588eac487f8fcc 100644 (file)
--- a/roles/ceph-rgw/tasks/main.yml
+++ b/roles/ceph-rgw/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: include common.yml
-  include: common.yml
+  include_tasks: common.yml
 
 - name: include pre_requisite.yml
   include: pre_requisite.yml

diff --git a/roles/ceph-rgw/tasks/multisite/main.yml b/roles/ceph-rgw/tasks/multisite/main.yml
index 6485e7338365d5d7774bf0583e2d00ebb8c0deb7..1f1b1a6fb3e947e2fba16ea055cb85a65cc2d251 100644 (file)
--- a/roles/ceph-rgw/tasks/multisite/main.yml
+++ b/roles/ceph-rgw/tasks/multisite/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: include multisite checks
-  include: checks.yml
+  include_tasks: checks.yml
 
 # Include the tasks depending on the zone type
 - name: include master multisite tasks

diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
index 8aed76ad3f31acd645ddcb395cb66363210d0dd1..71b4904317991afc5d1d544da5e020b08c243012 100644 (file)
--- a/roles/ceph-validate/tasks/main.yml
+++ b/roles/ceph-validate/tasks/main.yml
@@ -58,17 +58,17 @@
     - ceph_release_num[ceph_release] < ceph_release_num.luminous
 
 - name: include check_system.yml
-  include: check_system.yml
+  include_tasks: check_system.yml
 
 - name: include check_devices.yml
-  include: check_devices.yml
+  include_tasks: check_devices.yml
   when:
     - osd_group_name in group_names
     - not osd_auto_discovery | default(False)
     - osd_scenario != "lvm" and devices is not defined
 
 - name: include check_eth_mon.yml
-  include: check_eth_mon.yml
+  include_tasks: check_eth_mon.yml
   when:
     - mon_group_name in group_names
     - monitor_interface != "dummy"
@@ -76,7 +76,7 @@
     - monitor_address_block == "subnet"
 
 - name: include check_eth_rgw.yml
-  include: check_eth_rgw.yml
+  include_tasks: check_eth_rgw.yml
   when:
     - rgw_group_name in group_names
     - radosgw_interface != "dummy"