ceph-facts: move facts to defaults value

There's no need to define a variable via a fact if we can do it via a
default value. Using a fact could be interesseting to override the
default value on some condition.

- ceph_uid could be set to 167 by default because it's only different on
non containerized deployment on Debian/Ubuntu.
- rbd_client_directory_{owner,group,mode} could be set to ceph,ceph,0770
by default install of null as we are doing in the facts.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 1aea5fb635a8e4ffe7e091c1a81aedb63dd77440..418418d307afb31dd59b24417d20f8b19800dd70 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -272,6 +272,8 @@ dummy:
 
 #ceph_conf_key_directory: /etc/ceph
 
+#ceph_uid: 167
+
 # Permissions for keyring files in /etc/ceph
 #ceph_keyring_permissions: '0600'
 
@@ -311,9 +313,9 @@ dummy:
 # 'rbd_client_directory_mode: "0755"', *not*
 # 'rbd_client_directory_mode: 0755', or Ansible will complain: mode
 # must be in octal or symbolic form
-#rbd_client_directory_owner: null
-#rbd_client_directory_group: null
-#rbd_client_directory_mode: null
+#rbd_client_directory_owner: ceph
+#rbd_client_directory_group: ceph
+#rbd_client_directory_mode: "0770"
 
 #rbd_client_log_path: /var/log/ceph
 #rbd_client_log_file: "{{ rbd_client_log_path }}/qemu-guest-$pid.log" # must be writable by QEMU and allowed by SELinux or AppArmor

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 4f6d4a73c36cb21c9ea15cd39200fb5e8ff457e2..1e95ac0485e31538d774674c81f5eab55faa029f 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -272,6 +272,8 @@ ceph_iscsi_config_dev: false
 
 #ceph_conf_key_directory: /etc/ceph
 
+#ceph_uid: 167
+
 # Permissions for keyring files in /etc/ceph
 #ceph_keyring_permissions: '0600'
 
@@ -311,9 +313,9 @@ ceph_iscsi_config_dev: false
 # 'rbd_client_directory_mode: "0755"', *not*
 # 'rbd_client_directory_mode: 0755', or Ansible will complain: mode
 # must be in octal or symbolic form
-#rbd_client_directory_owner: null
-#rbd_client_directory_group: null
-#rbd_client_directory_mode: null
+#rbd_client_directory_owner: ceph
+#rbd_client_directory_group: ceph
+#rbd_client_directory_mode: "0770"
 
 #rbd_client_log_path: /var/log/ceph
 #rbd_client_log_file: "{{ rbd_client_log_path }}/qemu-guest-$pid.log" # must be writable by QEMU and allowed by SELinux or AppArmor

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 050447af07ea7ba8773a0eaf00eb83d807b3204e..15a62e115424270ca045b7787c3d8d6fcc0f6943 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -264,6 +264,8 @@ generate_fsid: true
 
 ceph_conf_key_directory: /etc/ceph
 
+ceph_uid: 167
+
 # Permissions for keyring files in /etc/ceph
 ceph_keyring_permissions: '0600'
 
@@ -303,9 +305,9 @@ rbd_client_directories: true # this will create rbd_client_log_path and rbd_clie
 # 'rbd_client_directory_mode: "0755"', *not*
 # 'rbd_client_directory_mode: 0755', or Ansible will complain: mode
 # must be in octal or symbolic form
-rbd_client_directory_owner: null
-rbd_client_directory_group: null
-rbd_client_directory_mode: null
+rbd_client_directory_owner: ceph
+rbd_client_directory_group: ceph
+rbd_client_directory_mode: "0770"
 
 rbd_client_log_path: /var/log/ceph
 rbd_client_log_file: "{{ rbd_client_log_path }}/qemu-guest-$pid.log" # must be writable by QEMU and allowed by SELinux or AppArmor

diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index fa5031b4a93497b789102824d0ca619b6cdfca50..2115fe5016adc0bddf457d61f86fad44b03d608b 100644 (file)
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -175,24 +175,6 @@
   set_fact:
     mds_name: "{{ ansible_hostname }}"
 
-- name: set_fact rbd_client_directory_owner ceph
-  set_fact:
-    rbd_client_directory_owner: ceph
-  when: rbd_client_directory_owner is not defined
-      or not rbd_client_directory_owner
-
-- name: set_fact rbd_client_directory_group rbd_client_directory_group
-  set_fact:
-    rbd_client_directory_group: ceph
-  when: rbd_client_directory_group is not defined
-      or not rbd_client_directory_group
-
-- name: set_fact rbd_client_directory_mode 0770
-  set_fact:
-    rbd_client_directory_mode: "0770"
-  when: rbd_client_directory_mode is not defined
-      or not rbd_client_directory_mode
-
 - name: resolve device link(s)
   command: readlink -f {{ item }}
   changed_when: false
@@ -241,31 +223,6 @@
     - not containerized_deployment | bool
     - ansible_os_family == 'Debian'
 
-- name: set_fact ceph_uid for red hat or suse based system - non container
-  set_fact:
-    ceph_uid: 167
-  when:
-    - not containerized_deployment | bool
-    - ansible_os_family in ['RedHat', 'Suse']
-
-- name: set_fact ceph_uid for debian based system - container
-  set_fact:
-    ceph_uid: 64045
-  when:
-    - containerized_deployment | bool
-    - ceph_docker_image_tag | string is search("ubuntu")
-
-- name: set_fact ceph_uid for red hat based system - container
-  set_fact:
-    ceph_uid: 167
-  when:
-    - containerized_deployment | bool
-    - (ceph_docker_image_tag | string is search("latest")
-      or ceph_docker_image_tag | string is search("centos")
-      or ceph_docker_image_tag | string is search("fedora")
-      or ceph_docker_image_tag | string is search("rhceph")
-      or (ansible_distribution == 'RedHat'))
-
 - name: set_fact rgw_hostname
   set_fact:
     rgw_hostname: "{% set _value = ansible_hostname -%}