Merge branch '2.10.5' into 2.10.5_ds_prompt_for_resize

shethdhvani · shethdhvani · commit 9b88a41a7a8f · 2024-03-12T12:59:09.000-07:00
diff --git a/playbooks/roles/autoscaling_mon/tasks/main.yml b/playbooks/roles/autoscaling_mon/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/boot-volume/tasks/main.yml b/playbooks/roles/boot-volume/tasks/main.yml
@@ -1,2 +1,2 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
diff --git a/playbooks/roles/cloud-agent_update/tasks/main.yml b/playbooks/roles/cloud-agent_update/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/cluster-cli/tasks/main.yml b/playbooks/roles/cluster-cli/tasks/main.yml
@@ -1,8 +1,8 @@
-- include: el7.yml
+- include_tasks: el7.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7'
 
-- include: el8.yml
+- include_tasks: el8.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/cron/tasks/main.yml b/playbooks/roles/cron/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/destroy_unreachable/tasks/main.yml b/playbooks/roles/destroy_unreachable/tasks/main.yml
@@ -1,7 +1,7 @@
-- include: common.yml
+- include_tasks: common.yml
 
-- include: slurm-rack-aware.yml
+- include_tasks: slurm-rack-aware.yml
   when: rack_aware | bool
 
-- include: slurm.yml
+- include_tasks: slurm.yml
   when: not rack_aware | bool
diff --git a/playbooks/roles/docker/tasks/main.yml b/playbooks/roles/docker/tasks/main.yml
@@ -1,10 +1,10 @@
 --- 
 
-- include: oraclelinux.yml
+- include_tasks: oraclelinux.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
 
-#- include: centos-7.yml
+#- include_tasks: centos-7.yml
 #  when: ansible_os_family == 'RedHat' and ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/etc-hosts/tasks/main.yml b/playbooks/roles/etc-hosts/tasks/main.yml
@@ -1 +1 @@
-- include: common.yml
+- include_tasks: common.yml
diff --git a/playbooks/roles/firewall/tasks/main.yml b/playbooks/roles/firewall/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/fix_broken/tasks/main.yml b/playbooks/roles/fix_broken/tasks/main.yml
@@ -2,5 +2,5 @@
 # tasks file for fix_broken
 
 # to resolve error for not able to install nfs-kernel-server. seeing the same error for compute nodes while installing other packages. so adding this to run on all compute hosts the first time itself.
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/fix_ldap/tasks/main.yml b/playbooks/roles/fix_ldap/tasks/main.yml
@@ -1,2 +1,2 @@
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/fss-home/tasks/main.yml b/playbooks/roles/fss-home/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/grafana/tasks/main.yml b/playbooks/roles/grafana/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/home_nfs/tasks/main.yml b/playbooks/roles/home_nfs/tasks/main.yml
@@ -1,2 +1,2 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
diff --git a/playbooks/roles/hostname/tasks/main.yml b/playbooks/roles/hostname/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/hyperthreading/tasks/main.yml b/playbooks/roles/hyperthreading/tasks/main.yml
@@ -1,5 +1,5 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/influxdb/tasks/main.yml b/playbooks/roles/influxdb/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/iscsi/tasks/main.yml b/playbooks/roles/iscsi/tasks/main.yml
@@ -1,8 +1,8 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Debian'
diff --git a/playbooks/roles/latency_check/tasks/main.yml b/playbooks/roles/latency_check/tasks/main.yml
@@ -1,2 +1,2 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
diff --git a/playbooks/roles/limits/tasks/main.yml b/playbooks/roles/limits/tasks/main.yml
@@ -1,10 +1,10 @@
 --- 
 
-- include: common.yml
+- include_tasks: common.yml
   when: ansible_os_family == 'RedHat'
 
-- include: common.yml
+- include_tasks: common.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: common.yml
+- include_tasks: common.yml
   when: ansible_distribution == 'Debian'
diff --git a/playbooks/roles/localdisk/tasks/main.yml b/playbooks/roles/localdisk/tasks/main.yml
@@ -1 +1 @@
-- include: common.yml
+- include_tasks: common.yml
diff --git a/playbooks/roles/mpi-hostfiles/tasks/main.yml b/playbooks/roles/mpi-hostfiles/tasks/main.yml
@@ -1,8 +1,8 @@
-- include: common.yml
+- include_tasks: common.yml
 #  when: ansible_os_family == 'RedHat'
 #
-#- include: ubuntu.yml
+#- include_tasks: ubuntu.yml
 #  when: ansible_distribution == 'Ubuntu'
 #
-#- include: debian.yml
+#- include_tasks: debian.yml
 #  when: ansible_distribution == 'Debian'
diff --git a/playbooks/roles/mpivars/tasks/main.yml b/playbooks/roles/mpivars/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 # tasks file for mpivars
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/mysql/tasks/main.yml b/playbooks/roles/mysql/tasks/main.yml
@@ -1,11 +1,11 @@
-- include: centos.yml
+- include_tasks: centos.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'CentOS'
 
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Debian'
diff --git a/playbooks/roles/nfs-client/tasks/main.yml b/playbooks/roles/nfs-client/tasks/main.yml
@@ -1,8 +1,8 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Debian'
diff --git a/playbooks/roles/nfs-server/tasks/main.yml b/playbooks/roles/nfs-server/tasks/main.yml
@@ -1,8 +1,8 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Debian'
diff --git a/playbooks/roles/no_instance_principal/tasks/main.yml b/playbooks/roles/no_instance_principal/tasks/main.yml
@@ -1,3 +1,3 @@
-- include: common.yml
+- include_tasks: common.yml
 
 
diff --git a/playbooks/roles/nvidia-container/tasks/main.yml b/playbooks/roles/nvidia-container/tasks/main.yml
@@ -1,10 +1,10 @@
 --- 
 
-- include: oraclelinux-7.yml
+- include_tasks: oraclelinux-7.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '7'
 
-#- include: centos-7.yml
+#- include_tasks: centos-7.yml
 #  when: ansible_os_family == 'RedHat' and ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/nvidia-enroot/tasks/main.yml b/playbooks/roles/nvidia-enroot/tasks/main.yml
@@ -1,10 +1,10 @@
 --- 
 
-- include: oraclelinux.yml
+- include_tasks: oraclelinux.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
 
-#- include: centos-7.yml
+#- include_tasks: centos-7.yml
 #  when: ansible_os_family == 'RedHat' and ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian' and ansible_distribution == 'Ubuntu' 
diff --git a/playbooks/roles/nvidia_peermem/tasks/main.yml b/playbooks/roles/nvidia_peermem/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
 # tasks file for nvidia_peermem
-- include: common.yml
+- include_tasks: common.yml
diff --git a/playbooks/roles/oci-cloud-agent/tasks/main.yml b/playbooks/roles/oci-cloud-agent/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/oci-cn-auth/tasks/main.yml b/playbooks/roles/oci-cn-auth/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian' and ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/oci-hostname/tasks/main.yml b/playbooks/roles/oci-hostname/tasks/main.yml
@@ -1,2 +1,2 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
diff --git a/playbooks/roles/oci-legacy/tasks/main.yml b/playbooks/roles/oci-legacy/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_os_family == 'Debian'
diff --git a/playbooks/roles/openldap/tasks/main.yml b/playbooks/roles/openldap/tasks/main.yml
@@ -4,11 +4,11 @@
 - include_vars: debian_vars.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
 
-#- include: el-8.yml
+#- include_tasks: el-8.yml
 #  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/packages/tasks/main.yml b/playbooks/roles/packages/tasks/main.yml
@@ -1,17 +1,17 @@
-- include: ol-7.yml
+- include_tasks: ol-7.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '7'
 
-- include: ol-8.yml
+- include_tasks: ol-8.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
 
-- include: centos-7.yml
+- include_tasks: centos-7.yml
   when: ansible_os_family == 'RedHat' and ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version < '22'
 
-- include: ubuntu-2204.yml
+- include_tasks: ubuntu-2204.yml
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version == '22'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Debian'
diff --git a/playbooks/roles/privilege_group/tasks/main.yml b/playbooks/roles/privilege_group/tasks/main.yml
@@ -1,5 +1,5 @@
-- include: common.yml
+- include_tasks: common.yml
 
-#- include: el.yml
+#- include_tasks: el.yml
 #  when: ansible_os_family == 'RedHat'
 
diff --git a/playbooks/roles/rack-aware/tasks/main.yml b/playbooks/roles/rack-aware/tasks/main.yml
@@ -1,6 +1,6 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
 
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
 
diff --git a/playbooks/roles/rdma-interface/tasks/main.yml b/playbooks/roles/rdma-interface/tasks/main.yml
@@ -1,10 +1,10 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == 'Debian'
 
 
diff --git a/playbooks/roles/safe_yum/tasks/main.yml b/playbooks/roles/safe_yum/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: el.yml
+- include_tasks: el.yml
   when: ansible_os_family == 'RedHat'
-- include: ubuntu.yml
+- include_tasks: ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/playbooks/roles/slurm/tasks/common.yml b/playbooks/roles/slurm/tasks/common.yml
@@ -187,9 +187,9 @@
     state: directory
 
 - name: Include pyxis prolog files
-  include: common_pyxis.yml
+  include_tasks: common_pyxis.yml
   when: pyxis|bool
 
 - name: Include pyxis prolog files
-  include: common_pmix.yml
+  include_tasks: common_pmix.yml
   when: ansible_os_family == 'RedHat'
diff --git a/playbooks/roles/slurm/tasks/compute-rack-aware.yml b/playbooks/roles/slurm/tasks/compute-rack-aware.yml
@@ -237,7 +237,7 @@
   when: racks_left_list | length > 0
 
 - name: Run Pam settings
-  include: compute_pam.yml
+  include_tasks: compute_pam.yml
   when: pam|bool
 
 - name: run handlers
diff --git a/playbooks/roles/slurm/tasks/compute.yml b/playbooks/roles/slurm/tasks/compute.yml
diff --git a/playbooks/roles/slurm/tasks/main.yml b/playbooks/roles/slurm/tasks/main.yml
diff --git a/playbooks/roles/spack/tasks/main.yml b/playbooks/roles/spack/tasks/main.yml
diff --git a/playbooks/roles/ssh/tasks/main.yml b/playbooks/roles/ssh/tasks/main.yml
diff --git a/playbooks/roles/ssl/tasks/main.yml b/playbooks/roles/ssl/tasks/main.yml
diff --git a/playbooks/roles/sssd/tasks/main.yml b/playbooks/roles/sssd/tasks/main.yml
diff --git a/playbooks/roles/telegraf/tasks/main.yml b/playbooks/roles/telegraf/tasks/main.yml
diff --git a/playbooks/roles/tuned/tasks/main.yml b/playbooks/roles/tuned/tasks/main.yml
diff --git a/playbooks/roles/yaml/tasks/main.yml b/playbooks/roles/yaml/tasks/main.yml

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-- include: el.yml`
	`1`	`+- include_tasks: el.yml`
`2`	`2`	`when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-- include: common.yml`
	`1`	`+- include_tasks: common.yml`