ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
(cherry picked from commit bcc673f66c)
pull/5828/head
Guillaume Abrioux 2020-07-08 15:49:47 +02:00 committed by Dimitri Savineau
parent c0654fa37a
commit b714e04d91
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
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'

2
group_vars/rhcs.yml.sample
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'

2
roles/ceph-defaults/defaults/main.yml
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'

7
roles/ceph-facts/tasks/facts.yml
View File

@ -212,13 +212,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: backward compatibility tasks related - name: backward compatibility tasks related
when: when:
- inventory_hostname in groups.get(rgw_group_name, []) - inventory_hostname in groups.get(rgw_group_name, [])