convert some missed `ansible_*`` calls to `ansible_facts['*']`

This converts some missed calls to `ansible_*` that were missed in
initial PR #6312

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 0163ecc924ccec3e5da9a9c4cfb8ac4558ec33ef)

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index 2abf4554d86dad0a2ce2d76d3122967d8be416c1..fc18785c9287ee808e97a852e55b92d80c8b8611 100644 (file)
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -29,7 +29,7 @@ dummy:
 # ideal when ceph-nfs is managed by pacemaker across multiple hosts - in
 # such case it's better to have constant instance id instead which
 # can be set by 'ceph_nfs_service_suffix'
-# ceph_nfs_service_suffix: ansible_hostname
+# ceph_nfs_service_suffix: "{{ ansible_facts['hostname'] }}"
 
 #######################
 # Access type options #

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index 91abec986ca3bd85e43ba568ee5f010f4aba973f..a57c1f3f4065d287581f91193d696c4233cef031 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -58,7 +58,7 @@ dummy:
 #bluestore_wal_devices: []
 
 #'osd_auto_discovery'  mode prevents you from filling out the 'devices' variable above.
-# Device discovery is based on the Ansible fact 'ansible_devices'
+# Device discovery is based on the Ansible fact 'ansible_facts["devices"]'
 # which reports all the devices on a system. If chosen, all the disks
 # found will be passed to ceph-volume lvm batch. You should not be worried on using
 # this option since ceph-volume has a built-in check which looks for empty devices.

diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index 364dd10b1252ccd49aee5fcabf731bdbc4da4e7d..68ca9bbe7de4972cbc7483cdb74bdbe29f7208bd 100644 (file)
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -34,7 +34,7 @@
   set_fact:
     ceph_release: "{{ ceph_stable_release }}"
 
-- name: set_fact monitor_name ansible_hostname
+- name: set_fact monitor_name ansible_facts['hostname']
   set_fact:
     monitor_name: "{{ hostvars[item]['ansible_facts']['hostname'] }}"
   delegate_to: "{{ item }}"

diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index 5f058525e677031f3f63637669c7b780986fe1a2..0029e7dbc4b77f441b3f7b33a1668ec26d3ea0ec 100644 (file)
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -21,7 +21,7 @@ ceph_nfs_enable_service: true
 # ideal when ceph-nfs is managed by pacemaker across multiple hosts - in
 # such case it's better to have constant instance id instead which
 # can be set by 'ceph_nfs_service_suffix'
-# ceph_nfs_service_suffix: ansible_hostname
+# ceph_nfs_service_suffix: "{{ ansible_facts['hostname'] }}"
 
 #######################
 # Access type options #

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index db21e623eb473a8e08b77fb04fcc77ad42baebd7..8eb1bebf39ba16b6523013147d1da0bcb194c2d1 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -50,7 +50,7 @@ dedicated_devices: []
 bluestore_wal_devices: []
 
 #'osd_auto_discovery'  mode prevents you from filling out the 'devices' variable above.
-# Device discovery is based on the Ansible fact 'ansible_devices'
+# Device discovery is based on the Ansible fact 'ansible_facts["devices"]'
 # which reports all the devices on a system. If chosen, all the disks
 # found will be passed to ceph-volume lvm batch. You should not be worried on using
 # this option since ceph-volume has a built-in check which looks for empty devices.