From a680707f6f8072208be31ecfa15cf4900d2c4b47 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 23 Nov 2016 11:14:32 +0100
Subject: [PATCH] All `include_vars` need to have `*.yml`, `*.yaml` or `*.json`
 extension.

As introduced in the following PR:
- https://github.com/ansible/ansible/pull/17207
we need to refactor our code.
---
 README.md                                     |  8 ++--
 ceph-aio-no-vagrant.sh                        | 24 +++++------
 generate_group_vars_sample.sh                 |  8 ++--
 group_vars/{agent.sample => agent.yml.sample} |  0
 ...ll.docker.sample => all.docker.yml.sample} |  0
 group_vars/{all.sample => all.yml.sample}     |  0
 ...keys.sample => ceph-fetch-keys.yml.sample} |  0
 .../{clients.sample => clients.yml.sample}    |  0
 ...reoss.sample => common-coreoss.yml.sample} |  0
 ...{iscsi-gws.sample => iscsi-gws.yml.sample} |  0
 group_vars/{mdss.sample => mdss.yml.sample}   |  0
 group_vars/{mons.sample => mons.yml.sample}   |  0
 group_vars/{nfss.sample => nfss.yml.sample}   |  0
 group_vars/{osds.sample => osds.yml.sample}   |  0
 ...-mirrors.sample => rbd-mirrors.yml.sample} |  0
 .../{restapis.sample => restapis.yml.sample}  |  0
 group_vars/{rgws.sample => rgws.yml.sample}   |  0
 infrastructure-playbooks/purge-cluster.yml    | 42 +++++++++----------
 .../purge-docker-cluster.yml                  | 42 +++++++++----------
 infrastructure-playbooks/shrink-mon.yml       |  2 +-
 infrastructure-playbooks/shrink-osd.yml       |  2 +-
 ...inerized-to-containerized-ceph-daemons.yml | 26 ++++++------
 .../take-over-existing-cluster.yml            |  4 +-
 23 files changed, 79 insertions(+), 79 deletions(-)
 rename group_vars/{agent.sample => agent.yml.sample} (100%)
 rename group_vars/{all.docker.sample => all.docker.yml.sample} (100%)
 rename group_vars/{all.sample => all.yml.sample} (100%)
 rename group_vars/{ceph-fetch-keys.sample => ceph-fetch-keys.yml.sample} (100%)
 rename group_vars/{clients.sample => clients.yml.sample} (100%)
 rename group_vars/{common-coreoss.sample => common-coreoss.yml.sample} (100%)
 rename group_vars/{iscsi-gws.sample => iscsi-gws.yml.sample} (100%)
 rename group_vars/{mdss.sample => mdss.yml.sample} (100%)
 rename group_vars/{mons.sample => mons.yml.sample} (100%)
 rename group_vars/{nfss.sample => nfss.yml.sample} (100%)
 rename group_vars/{osds.sample => osds.yml.sample} (100%)
 rename group_vars/{rbd-mirrors.sample => rbd-mirrors.yml.sample} (100%)
 rename group_vars/{restapis.sample => restapis.yml.sample} (100%)
 rename group_vars/{rgws.sample => rgws.yml.sample} (100%)

diff --git a/README.md b/README.md
index fa0b1bf56..36b60deda 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ please use the `ceph_conf_overrides` variable.
 ## Special notes
 
 If you are looking at deploying a Ceph version older than Jewel.
-It is highly recommended that you apply the following settings to your `group_vars/all` file on the `ceph_conf_overrides` variable:
+It is highly recommended that you apply the following settings to your `group_vars/all.yml` file on the `ceph_conf_overrides` variable:
 
 ```
 ceph_conf_overrides:
@@ -171,7 +171,7 @@ $ vagrant provision
 
 The Vagrantfile specifies an fsid for the cluster and a secret key for the
 monitor. If using these playbooks in production, you must generate your own `fsid`
-in `group_vars/all` and `monitor_secret` in `group_vars/mons`. Those files contain
+in `group_vars/all.yml` and `monitor_secret` in `group_vars/mons.yml`. Those files contain
 information about how to generate appropriate values for these variables.
 
 ## Specifying package origin
@@ -243,7 +243,7 @@ Attention, ceph-common doesn't manage backports repository, you must add it your
 ### For Atomic systems
 
 If you want to run containerized deployment on Atomic systems (RHEL/CentOS Atomic), please copy
-[vagrant_variables.yml.atomic](vagrant_variables.yml.atomic) to vagrant_variables.yml, and copy [group_vars/all.docker](group_vars/all.docker) to `group_vars/all`.
+[vagrant_variables.yml.atomic](vagrant_variables.yml.atomic) to vagrant_variables.yml, and copy [group_vars/all.docker.yml.sample](group_vars/all.docker.yml.sample) to `group_vars/all.yml`.
 
 Since `centos/atomic-host` VirtualBox box doesn't have spare storage controller to attach more disks, it is likely the first time `vagrant up --provider=virtualbox` runs, it will fail to attach to a storage controller. In such case, run the following command:
 
@@ -259,7 +259,7 @@ Install the Vagrant plugin for the openstack provider: `vagrant plugin install v
 
 ```bash
 $ cp site.yml.sample site.yml
-$ cp group_vars/all.docker.sample group_vars/all
+$ cp group_vars/all.docker.yml.sample group_vars/all.yml
 $ cp vagrant_variables.yml.openstack vagrant_variables.yml
 ```
 * Edit `vagrant_variables.yml`:
diff --git a/ceph-aio-no-vagrant.sh b/ceph-aio-no-vagrant.sh
index 0a68fa3c0..e30508fbe 100755
--- a/ceph-aio-no-vagrant.sh
+++ b/ceph-aio-no-vagrant.sh
@@ -89,24 +89,24 @@ function ssh_setup {
 }
 
 function cp_var {
-  cp group_vars/all.sample group_vars/all
-  cp group_vars/osds.sample group_vars/osds
+  cp group_vars/all.yml.sample group_vars/all.yml
+  cp group_vars/osds.yml.sample group_vars/osds.yml
   cp site.yml.sample site.yml
 }
 
 function populate_vars {
-  sed -i "s/#osd_auto_discovery: false/osd_auto_discovery: true/" group_vars/osds
-  sed -i "s/#journal_collocation: false/journal_collocation: true/" group_vars/osds
-  sed -i "s/#pool_default_size: 3/pool_default_size: 2/" group_vars/all
-  sed -i "s/#monitor_address: 0.0.0.0/monitor_address: ${IP}/" group_vars/all
-  sed -i "s/#journal_size: 0/journal_size: 100/" group_vars/all
-  sed -i "s|#public_network: 0.0.0.0\/0|public_network: ${SUBNET}|" group_vars/all
-  sed -i "s/#common_single_host_mode: true/common_single_host_mode: true/" group_vars/all
+  sed -i "s/#osd_auto_discovery: false/osd_auto_discovery: true/" group_vars/osds.yml
+  sed -i "s/#journal_collocation: false/journal_collocation: true/" group_vars/osds.yml
+  sed -i "s/#pool_default_size: 3/pool_default_size: 2/" group_vars/all.yml
+  sed -i "s/#monitor_address: 0.0.0.0/monitor_address: ${IP}/" group_vars/all.yml
+  sed -i "s/#journal_size: 0/journal_size: 100/" group_vars/all.yml
+  sed -i "s|#public_network: 0.0.0.0\/0|public_network: ${SUBNET}|" group_vars/all.yml
+  sed -i "s/#common_single_host_mode: true/common_single_host_mode: true/" group_vars/all.yml
   if [[ ${SOURCE} == 'stable' ]]; then
-    sed -i "s/#ceph_stable: false/ceph_stable: true/" group_vars/all
+    sed -i "s/#ceph_stable: false/ceph_stable: true/" group_vars/all.yml
   else
-    sed -i "s/#ceph_dev: false/ceph_dev: true/" group_vars/all
-    sed -i "s|#ceph_dev_branch: master|ceph_dev_branch: ${BRANCH}|" group_vars/all
+    sed -i "s/#ceph_dev: false/ceph_dev: true/" group_vars/all.yml
+    sed -i "s|#ceph_dev_branch: master|ceph_dev_branch: ${BRANCH}|" group_vars/all.yml
   fi
 }
 
diff --git a/generate_group_vars_sample.sh b/generate_group_vars_sample.sh
index 420370565..9befa3efa 100755
--- a/generate_group_vars_sample.sh
+++ b/generate_group_vars_sample.sh
@@ -7,13 +7,13 @@ basedir=$(dirname "$0")
 for role in "$basedir"/roles/ceph-*; do
   rolename=$(basename "$role")
   if [[ $rolename == "ceph-common" ]]; then
-      output="all.sample"
+      output="all.yml.sample"
   elif [[ $rolename == "ceph-agent" ]]; then
-      output="agent.sample"
+      output="agent.yml.sample"
   elif [[ $rolename == "ceph-fetch-keys" ]]; then
-      output="ceph-fetch-keys.sample"
+      output="ceph-fetch-keys.yml.sample"
   else
-      output="${rolename:5}s.sample"
+      output="${rolename:5}s.yml.sample"
   fi
 
   cat <<EOF > "$basedir"/group_vars/"$output"
diff --git a/group_vars/agent.sample b/group_vars/agent.yml.sample
similarity index 100%
rename from group_vars/agent.sample
rename to group_vars/agent.yml.sample
diff --git a/group_vars/all.docker.sample b/group_vars/all.docker.yml.sample
similarity index 100%
rename from group_vars/all.docker.sample
rename to group_vars/all.docker.yml.sample
diff --git a/group_vars/all.sample b/group_vars/all.yml.sample
similarity index 100%
rename from group_vars/all.sample
rename to group_vars/all.yml.sample
diff --git a/group_vars/ceph-fetch-keys.sample b/group_vars/ceph-fetch-keys.yml.sample
similarity index 100%
rename from group_vars/ceph-fetch-keys.sample
rename to group_vars/ceph-fetch-keys.yml.sample
diff --git a/group_vars/clients.sample b/group_vars/clients.yml.sample
similarity index 100%
rename from group_vars/clients.sample
rename to group_vars/clients.yml.sample
diff --git a/group_vars/common-coreoss.sample b/group_vars/common-coreoss.yml.sample
similarity index 100%
rename from group_vars/common-coreoss.sample
rename to group_vars/common-coreoss.yml.sample
diff --git a/group_vars/iscsi-gws.sample b/group_vars/iscsi-gws.yml.sample
similarity index 100%
rename from group_vars/iscsi-gws.sample
rename to group_vars/iscsi-gws.yml.sample
diff --git a/group_vars/mdss.sample b/group_vars/mdss.yml.sample
similarity index 100%
rename from group_vars/mdss.sample
rename to group_vars/mdss.yml.sample
diff --git a/group_vars/mons.sample b/group_vars/mons.yml.sample
similarity index 100%
rename from group_vars/mons.sample
rename to group_vars/mons.yml.sample
diff --git a/group_vars/nfss.sample b/group_vars/nfss.yml.sample
similarity index 100%
rename from group_vars/nfss.sample
rename to group_vars/nfss.yml.sample
diff --git a/group_vars/osds.sample b/group_vars/osds.yml.sample
similarity index 100%
rename from group_vars/osds.sample
rename to group_vars/osds.yml.sample
diff --git a/group_vars/rbd-mirrors.sample b/group_vars/rbd-mirrors.yml.sample
similarity index 100%
rename from group_vars/rbd-mirrors.sample
rename to group_vars/rbd-mirrors.yml.sample
diff --git a/group_vars/restapis.sample b/group_vars/restapis.yml.sample
similarity index 100%
rename from group_vars/restapis.sample
rename to group_vars/restapis.yml.sample
diff --git a/group_vars/rgws.sample b/group_vars/rgws.yml.sample
similarity index 100%
rename from group_vars/rgws.sample
rename to group_vars/rgws.yml.sample
diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index 07245423d..ec4426824 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -73,9 +73,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-mds/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ mds_group_name }}
+  - include_vars: group_vars/{{ mds_group_name }}.yml
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -124,9 +124,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-rgw/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ rgw_group_name }}
+  - include_vars: group_vars/{{ rgw_group_name }}.yml
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -175,9 +175,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-rbd-mirror/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ rbdmirror_group_name }}
+  - include_vars: group_vars/{{ rbdmirror_group_name }}.yml
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -220,9 +220,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-nfs/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ nfs_group_name }}
+  - include_vars: group_vars/{{ nfs_group_name }}.yml
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -289,9 +289,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-osd/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ osd_group_name }}
+  - include_vars: group_vars/{{ osd_group_name }}.yml
     failed_when: false
 
   - name: check for a device list
@@ -443,11 +443,11 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-mon/defaults/main.yml
   - include_vars: roles/ceph-restapi/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ mon_group_name }}
+  - include_vars: group_vars/{{ mon_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ restapi_group_name }}
+  - include_vars: group_vars/{{ restapi_group_name }}.yml
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -669,21 +669,21 @@
 
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ mds_group_name }}
+  - include_vars: group_vars/{{ mds_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ rgw_group_name }}
+  - include_vars: group_vars/{{ rgw_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ rbdmirror_group_name }}
+  - include_vars: group_vars/{{ rbdmirror_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ nfs_group_name }}
+  - include_vars: group_vars/{{ nfs_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ osd_group_name }}
+  - include_vars: group_vars/{{ osd_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ mon_group_name }}
+  - include_vars: group_vars/{{ mon_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ restapi_group_name }}
+  - include_vars: group_vars/{{ restapi_group_name }}.yml
     failed_when: false
 
   - name: purge fetch directory for localhost
diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index 0bf9081d5..9ad1c35ef 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -57,9 +57,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-mds/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ mds_group_name }}
+  - include_vars: group_vars/{{ mds_group_name }}.yml
     failed_when: false
 
   - name: disable ceph mds service
@@ -103,9 +103,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-rgw/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ rgw_group_name }}
+  - include_vars: group_vars/{{ rgw_group_name }}.yml
     failed_when: false
 
   - name: disable ceph rgw service
@@ -149,9 +149,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-rbd-mirror/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ rbdmirror_group_name }}
+  - include_vars: group_vars/{{ rbdmirror_group_name }}.yml
     failed_when: false
 
   - name: disable ceph rbd-mirror service
@@ -195,9 +195,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-nfs/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ nfs_group_name }}
+  - include_vars: group_vars/{{ nfs_group_name }}.yml
     failed_when: false
 
   - name: disable ceph nfs service
@@ -250,9 +250,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-osd/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ osd_group_name }}
+  - include_vars: group_vars/{{ osd_group_name }}.yml
     failed_when: false
 
   - name: disable ceph osd service
@@ -347,11 +347,11 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-mon/defaults/main.yml
   - include_vars: roles/ceph-restapi/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ mon_group_name }}
+  - include_vars: group_vars/{{ mon_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ restapi_group_name }}
+  - include_vars: group_vars/{{ restapi_group_name }}.yml
     failed_when: false
 
   - name: disable ceph mon service
@@ -610,21 +610,21 @@
 
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ mds_group_name }}
+  - include_vars: group_vars/{{ mds_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ rgw_group_name }}
+  - include_vars: group_vars/{{ rgw_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ rbdmirror_group_name }}
+  - include_vars: group_vars/{{ rbdmirror_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ nfs_group_name }}
+  - include_vars: group_vars/{{ nfs_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ osd_group_name }}
+  - include_vars: group_vars/{{ osd_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ mon_group_name }}
+  - include_vars: group_vars/{{ mon_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ restapi_group_name }}
+  - include_vars: group_vars/{{ restapi_group_name }}.yml
     failed_when: false
 
   - name: purge fetch directory for localhost
diff --git a/infrastructure-playbooks/shrink-mon.yml b/infrastructure-playbooks/shrink-mon.yml
index 93f74c449..cca6c6b45 100644
--- a/infrastructure-playbooks/shrink-mon.yml
+++ b/infrastructure-playbooks/shrink-mon.yml
@@ -28,7 +28,7 @@
 
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
 
   - name: exit playbook, if user did not mean to shrink cluster
     fail:
diff --git a/infrastructure-playbooks/shrink-osd.yml b/infrastructure-playbooks/shrink-osd.yml
index bf266b6fa..59842e7b4 100644
--- a/infrastructure-playbooks/shrink-osd.yml
+++ b/infrastructure-playbooks/shrink-osd.yml
@@ -28,7 +28,7 @@
 
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
 
   - name: exit playbook, if user did not mean to shrink cluster
     fail:
diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index 6fdf6b776..0bf7bc227 100644
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -106,11 +106,11 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-mon/defaults/main.yml
   - include_vars: roles/ceph-restapi/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ mon_group_name }}
+  - include_vars: group_vars/{{ mon_group_name }}.yml
     failed_when: false
-  - include_vars: group_vars/{{ restapi_group_name }}
+  - include_vars: group_vars/{{ restapi_group_name }}.yml
     failed_when: false
 
   - name: select a running monitor
@@ -195,9 +195,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-osd/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ osd_group_name }}
+  - include_vars: group_vars/{{ osd_group_name }}.yml
     failed_when: false
 
   - name: collect osd ids
@@ -300,9 +300,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-mds/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ mds_group_name }}
+  - include_vars: group_vars/{{ mds_group_name }}.yml
     failed_when: false
 
   - name: stop ceph mds service
@@ -360,9 +360,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-rgw/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ rgw_group_name }}
+  - include_vars: group_vars/{{ rgw_group_name }}.yml
     failed_when: false
 
   - name: stop ceph rgw service
@@ -421,9 +421,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-rbd-mirror/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ rbdmirror_group_name }}
+  - include_vars: group_vars/{{ rbdmirror_group_name }}.yml
     failed_when: false
 
   - name: stop ceph rbd mirror service
@@ -480,9 +480,9 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-nfs/defaults/main.yml
-  - include_vars: group_vars/all
+  - include_vars: group_vars/all.yml
     failed_when: false
-  - include_vars: group_vars/{{ nfs_group_name }}
+  - include_vars: group_vars/{{ nfs_group_name }}.yml
     failed_when: false
 
   - name: stop ceph nfs service
diff --git a/infrastructure-playbooks/take-over-existing-cluster.yml b/infrastructure-playbooks/take-over-existing-cluster.yml
index ce4eaa48f..8347c1bef 100644
--- a/infrastructure-playbooks/take-over-existing-cluster.yml
+++ b/infrastructure-playbooks/take-over-existing-cluster.yml
@@ -15,7 +15,7 @@
   become: True
   vars_files:
     - roles/ceph-common/defaults/main.yml
-    - group_vars/all
+    - group_vars/all.yml
   roles:
     - ceph-fetch-keys
 
@@ -24,7 +24,7 @@
 
   tasks:
     - include_vars: roles/ceph-common/defaults/main.yml
-    - include_vars: group_vars/all
+    - include_vars: group_vars/all.yml
 
     - name: get the name of the existing ceph cluster
       shell: "ls /etc/ceph/*.conf"
-- 
2.39.5