From bcc673f66c22364766beb4b5ebb971bd3f517693 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 8 Jul 2020 15:49:47 +0200 Subject: [PATCH] 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 --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- roles/ceph-facts/tasks/facts.yml | 7 ------- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 8346974a5..083070f18 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -257,7 +257,7 @@ dummy: #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 #ceph_keyring_permissions: '0600' diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 5c847705d..ad8c6511e 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -257,7 +257,7 @@ ceph_iscsi_config_dev: false #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 #ceph_keyring_permissions: '0600' diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 256173743..621307115 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -249,7 +249,7 @@ generate_fsid: true 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 ceph_keyring_permissions: '0600' diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml index 399365828..0a3d971ea 100644 --- a/roles/ceph-facts/tasks/facts.yml +++ b/roles/ceph-facts/tasks/facts.yml @@ -218,13 +218,6 @@ - item.value.holders|count == 0 - 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 set_fact: rgw_hostname: "{% set _value = ansible_hostname -%}