From 76be9a42925e7e4abf3f44d550faabb3652a33a4 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 5 Oct 2020 17:41:20 +0200
Subject: [PATCH] ceph-config: ceph.conf rendering refactor

This commit cleans up the `main.yml` task file of `ceph-config`.
It drops the local ceph.conf generation.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 900c0f44925ec0c6c1acb16433044ac40717e00e)
---
 group_vars/all.yml.sample             |   2 -
 group_vars/rhcs.yml.sample            |   2 -
 roles/ceph-config/tasks/main.yml      | 112 ++++++--------------------
 roles/ceph-defaults/defaults/main.yml |   2 -
 4 files changed, 25 insertions(+), 93 deletions(-)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 5efb06b97..f80c370c9 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -76,8 +76,6 @@ dummy:
 #ceph_dashboard_firewall_zone: public
 #ceph_rgwloadbalancer_firewall_zone: public
 
-# Generate local ceph.conf in fetch directory
-#ceph_conf_local: false
 
 ############
 # PACKAGES #
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index a0b66a43b..f336c8d5d 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -76,8 +76,6 @@ fetch_directory: ~/ceph-ansible-keys
 #ceph_dashboard_firewall_zone: public
 #ceph_rgwloadbalancer_firewall_zone: public
 
-# Generate local ceph.conf in fetch directory
-#ceph_conf_local: false
 
 ############
 # PACKAGES #
diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index 74856b51b..f831ab236 100644
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -89,92 +89,30 @@
       - devices | default([]) | length > 0
       - not (lvm_batch_report.stdout | default('{}') | from_json).changed | default(false) | bool
 
-# ceph-common
-- name: config file operation for non-containerized scenarios
+- name: create ceph conf directory
+  file:
+    path: "/etc/ceph"
+    state: directory
+    owner: "ceph"
+    group: "ceph"
+    mode: "{{ ceph_directories_mode }}"
   when: not containerized_deployment | bool
-  block:
-  - name: create ceph conf directory
-    file:
-      path: "/etc/ceph"
-      state: directory
-      owner: "ceph"
-      group: "ceph"
-      mode: "{{ ceph_directories_mode }}"
 
-  - name: "generate ceph configuration file: {{ cluster }}.conf"
-    action: config_template
-    args:
-      src: ceph.conf.j2
-      dest: /etc/ceph/{{ cluster }}.conf
-      owner: "ceph"
-      group: "ceph"
-      mode: "0644"
-      config_overrides: "{{ ceph_conf_overrides }}"
-      config_type: ini
-    notify:
-      - restart ceph mons
-      - restart ceph osds
-      - restart ceph mdss
-      - restart ceph rgws
-      - restart ceph mgrs
-      - restart ceph rbdmirrors
-      - restart ceph rbd-target-api-gw
-
-  - name: "ensure fetch directory exists"
-    run_once: true
-    become: false
-    file:
-      path: "{{ fetch_directory }}/{{ fsid }}/etc/ceph"
-      state: directory
-      mode: "{{ ceph_directories_mode }}"
-    delegate_to: localhost
-    when: ceph_conf_local | bool
-
-  - name: "generate {{ cluster }}.conf configuration file locally"
-    config_template:
-    become: false
-    run_once: true
-    delegate_to: localhost
-    args:
-      src: "ceph.conf.j2"
-      dest: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.conf"
-      config_overrides: "{{ ceph_conf_overrides }}"
-      config_type: ini
-    when:
-      - inventory_hostname in groups.get(mon_group_name, [])
-      - ceph_conf_local | bool
-
-- name: config file operations for containerized scenarios
-  when: containerized_deployment | bool
-  block:
-  - name: create a local fetch directory if it does not exist
-    file:
-      path: "{{ fetch_directory }}"
-      state: directory
-    delegate_to: localhost
-    changed_when: false
-    become: false
-    run_once: true
-    when:
-      - (cephx or generate_fsid) | bool
-      - ((inventory_hostname in groups.get(mon_group_name, [])) or
-        (groups.get(nfs_group_name, []) | length > 0) and inventory_hostname == groups.get(nfs_group_name, [])[0])
-
-  - name: "generate {{ cluster }}.conf configuration file"
-    action: config_template
-    args:
-      src: "ceph.conf.j2"
-      dest: "{{ ceph_conf_key_directory }}/{{ cluster }}.conf"
-      owner: "root"
-      group: "root"
-      mode: "0644"
-      config_overrides: "{{ ceph_conf_overrides }}"
-      config_type: ini
-    notify:
-      - restart ceph mons
-      - restart ceph osds
-      - restart ceph mdss
-      - restart ceph rgws
-      - restart ceph mgrs
-      - restart ceph rbdmirrors
-      - restart ceph rbd-target-api-gw
+- name: "generate {{ cluster }}.conf configuration file"
+  action: config_template
+  args:
+    src: "ceph.conf.j2"
+    dest: "{{ ceph_conf_key_directory }}/{{ cluster }}.conf"
+    owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
+    group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
+    mode: "0644"
+    config_overrides: "{{ ceph_conf_overrides }}"
+    config_type: ini
+  notify:
+    - restart ceph mons
+    - restart ceph osds
+    - restart ceph mdss
+    - restart ceph rgws
+    - restart ceph mgrs
+    - restart ceph rbdmirrors
+    - restart ceph rbd-target-api-gw
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 39c6cf74c..ae6cf3dd4 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -68,8 +68,6 @@ ceph_iscsi_firewall_zone: public
 ceph_dashboard_firewall_zone: public
 ceph_rgwloadbalancer_firewall_zone: public
 
-# Generate local ceph.conf in fetch directory
-ceph_conf_local: false
 
 ############
 # PACKAGES #