From 608bad901da50e3cf9d7e19a2d086d04b4f8b969 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 1 Aug 2017 15:11:45 +0200 Subject: [PATCH] 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 --- roles/ceph-docker-common/tasks/create_configs.yml | 6 ------ roles/ceph-docker-common/tasks/fetch_configs.yml | 1 - 2 files changed, 7 deletions(-) diff --git a/roles/ceph-docker-common/tasks/create_configs.yml b/roles/ceph-docker-common/tasks/create_configs.yml index a33f72f4b..d85644222 100644 --- 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 b321b5495..a432a7ea2 100644 --- 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" -- 2.39.5