docker-common: Fix bug when updating config

in containerized deployment, if you try to update your `ceph.conf` file
it won't be actually updated on your nodes because it is overwritten by
the copy of the file which is present in your fetch directory.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-docker-common/tasks/create_configs.yml b/roles/ceph-docker-common/tasks/create_configs.yml
index a33f72f4b3b5460a3dd882720d565f939b89b981..d85644222dfb75bbbfe591c19515869536e2c56d 100644 (file)
--- a/roles/ceph-docker-common/tasks/create_configs.yml
+++ b/roles/ceph-docker-common/tasks/create_configs.yml
@@ -42,12 +42,6 @@
     mode: "0644"
     config_overrides: "{{ ceph_conf_overrides }}"
     config_type: ini
-  when:
-    - (not mon_containerized_default_ceph_conf_with_kv and
-        (inventory_hostname in groups.get(mon_group_name, []) or inventory_hostname in groups.get(osd_group_name, []))) or
-      (not mon_containerized_default_ceph_conf_with_kv and
-        ((groups.get(nfs_group_name, []) | length > 0)
-          and (inventory_hostname == groups.get(nfs_group_name, [])[0])))
   notify:
     - restart ceph mons
     - restart ceph osds

diff --git a/roles/ceph-docker-common/tasks/fetch_configs.yml b/roles/ceph-docker-common/tasks/fetch_configs.yml
index b321b549533ccb024d36aa6186987a5428efd2bb..a432a7ea21e7123ab5783dc81d465ebd9c3d2673 100644 (file)
--- a/roles/ceph-docker-common/tasks/fetch_configs.yml
+++ b/roles/ceph-docker-common/tasks/fetch_configs.yml
@@ -2,7 +2,6 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - "{{ ceph_conf_key_directory }}/{{ cluster }}.conf"
       - "{{ ceph_conf_key_directory }}/{{ cluster }}.client.admin.keyring"
       - "{{ ceph_conf_key_directory }}/monmap-{{ cluster }}"
       - "{{ ceph_conf_key_directory }}/{{ cluster }}.mon.keyring"