facts: refact `ceph_uid` fact

There's no need to set this fact with a `set_fact`
We can achieve this in `ceph-defaults`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/5518/head
Guillaume Abrioux 2020-07-08 15:49:47 +02:00
parent f402ab2b87
commit bcc673f66c
4 changed files with 3 additions and 10 deletions

View File

@ -257,7 +257,7 @@ dummy:
#ceph_conf_key_directory: /etc/ceph #ceph_conf_key_directory: /etc/ceph
#ceph_uid: 167 #ceph_uid: "{{ '64045' if not containerized_deployment | bool and ansible_os_family == 'Debian' else '167' }}"
# Permissions for keyring files in /etc/ceph # Permissions for keyring files in /etc/ceph
#ceph_keyring_permissions: '0600' #ceph_keyring_permissions: '0600'

View File

@ -257,7 +257,7 @@ ceph_iscsi_config_dev: false
#ceph_conf_key_directory: /etc/ceph #ceph_conf_key_directory: /etc/ceph
#ceph_uid: 167 #ceph_uid: "{{ '64045' if not containerized_deployment | bool and ansible_os_family == 'Debian' else '167' }}"
# Permissions for keyring files in /etc/ceph # Permissions for keyring files in /etc/ceph
#ceph_keyring_permissions: '0600' #ceph_keyring_permissions: '0600'

View File

@ -249,7 +249,7 @@ generate_fsid: true
ceph_conf_key_directory: /etc/ceph ceph_conf_key_directory: /etc/ceph
ceph_uid: 167 ceph_uid: "{{ '64045' if not containerized_deployment | bool and ansible_os_family == 'Debian' else '167' }}"
# Permissions for keyring files in /etc/ceph # Permissions for keyring files in /etc/ceph
ceph_keyring_permissions: '0600' ceph_keyring_permissions: '0600'

View File

@ -218,13 +218,6 @@
- item.value.holders|count == 0 - item.value.holders|count == 0
- item.key is not match osd_auto_discovery_exclude - item.key is not match osd_auto_discovery_exclude
- name: set_fact ceph_uid for debian based system - non container
set_fact:
ceph_uid: 64045
when:
- not containerized_deployment | bool
- ansible_os_family == 'Debian'
- name: set_fact rgw_hostname - name: set_fact rgw_hostname
set_fact: set_fact:
rgw_hostname: "{% set _value = ansible_hostname -%} rgw_hostname: "{% set _value = ansible_hostname -%}