From cb05172605a12f752b2ae007aac6967e4bc25baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 20 Sep 2017 16:33:29 +0200 Subject: [PATCH] docker: we don't need to copy the ceph.conf on all the nodes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We generate the ceph.conf on all the nodes through the ceph-docker-common so there is no need to push it to the Ansible file. Also this is breaking the ceph.conf template generation since we only generate sections based on the host the ansible task is running on. For example, what's typically happening, we bootstrap the monitor, we get a ceph.conf generated for a mon only, we go on an osd, we generate the ceph.conf with osd section (done by ceph-docker-common) but this gets overwritten by the copy_config task of the ceph-osd role. Signed-off-by: Sébastien Han --- roles/ceph-mds/tasks/docker/copy_configs.yml | 1 - roles/ceph-mgr/tasks/docker/copy_configs.yml | 1 - roles/ceph-mon/tasks/docker/copy_configs.yml | 1 - roles/ceph-nfs/tasks/docker/copy_configs.yml | 1 - roles/ceph-osd/tasks/copy_configs.yml | 1 - roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml | 1 - roles/ceph-restapi/tasks/docker/copy_configs.yml | 1 - roles/ceph-rgw/tasks/docker/copy_configs.yml | 1 - 8 files changed, 8 deletions(-) diff --git a/roles/ceph-mds/tasks/docker/copy_configs.yml b/roles/ceph-mds/tasks/docker/copy_configs.yml index 62c6ec3bc..022e114d1 100644 --- a/roles/ceph-mds/tasks/docker/copy_configs.yml +++ b/roles/ceph-mds/tasks/docker/copy_configs.yml @@ -2,7 +2,6 @@ - name: set_fact ceph_config_keys set_fact: ceph_config_keys: - - /etc/ceph/{{ cluster }}.conf - /etc/ceph/{{ cluster }}.client.admin.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring diff --git a/roles/ceph-mgr/tasks/docker/copy_configs.yml b/roles/ceph-mgr/tasks/docker/copy_configs.yml index 8ce8b64a0..5a371b19f 100644 --- a/roles/ceph-mgr/tasks/docker/copy_configs.yml +++ b/roles/ceph-mgr/tasks/docker/copy_configs.yml @@ -2,7 +2,6 @@ - name: set_fact ceph_config_keys set_fact: ceph_config_keys: - - /etc/ceph/{{ cluster }}.conf - /etc/ceph/{{ cluster }}.mgr.{{ ansible_hostname }}.keyring - name: stat for ceph config and keys diff --git a/roles/ceph-mon/tasks/docker/copy_configs.yml b/roles/ceph-mon/tasks/docker/copy_configs.yml index 123dc36d9..9d04704d8 100644 --- a/roles/ceph-mon/tasks/docker/copy_configs.yml +++ b/roles/ceph-mon/tasks/docker/copy_configs.yml @@ -2,7 +2,6 @@ - name: set_fact ceph_config_keys set_fact: ceph_config_keys: - - /etc/ceph/{{ cluster }}.conf - /etc/ceph/{{ cluster }}.client.admin.keyring - /etc/ceph/monmap-{{ cluster }} - /etc/ceph/{{ cluster }}.mon.keyring diff --git a/roles/ceph-nfs/tasks/docker/copy_configs.yml b/roles/ceph-nfs/tasks/docker/copy_configs.yml index ed69e2cb6..9686111b1 100644 --- a/roles/ceph-nfs/tasks/docker/copy_configs.yml +++ b/roles/ceph-nfs/tasks/docker/copy_configs.yml @@ -2,7 +2,6 @@ - name: set config and keys paths set_fact: ceph_config_keys: - - /etc/ceph/{{ cluster }}.conf - /etc/ceph/{{ cluster }}.client.admin.keyring - /var/lib/ceph/radosgw/keyring diff --git a/roles/ceph-osd/tasks/copy_configs.yml b/roles/ceph-osd/tasks/copy_configs.yml index 2501f5bbf..9a9e1dc70 100644 --- a/roles/ceph-osd/tasks/copy_configs.yml +++ b/roles/ceph-osd/tasks/copy_configs.yml @@ -2,7 +2,6 @@ - name: set config and keys paths set_fact: ceph_config_keys: - - /etc/ceph/{{ cluster }}.conf - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring - name: wait for ceph.conf and keys diff --git a/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml b/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml index 3f50d879e..87704ed26 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml @@ -8,7 +8,6 @@ - name: set_fact ceph_config_keys set_fact: ceph_config_keys: - - /etc/ceph/{{ cluster }}.conf - /etc/ceph/{{ cluster }}.client.admin.keyring - "{{ bootstrap_rbd_keyring | default([]) }}" diff --git a/roles/ceph-restapi/tasks/docker/copy_configs.yml b/roles/ceph-restapi/tasks/docker/copy_configs.yml index 2ecb548bb..dbc979dac 100644 --- a/roles/ceph-restapi/tasks/docker/copy_configs.yml +++ b/roles/ceph-restapi/tasks/docker/copy_configs.yml @@ -2,7 +2,6 @@ - name: set_fact ceph_config_keys set_fact: ceph_config_keys: - - /etc/ceph/{{ cluster }}.conf - /etc/ceph/{{ cluster }}.client.admin.keyring - name: stat for ceph config and keys diff --git a/roles/ceph-rgw/tasks/docker/copy_configs.yml b/roles/ceph-rgw/tasks/docker/copy_configs.yml index 312cadfdb..6daa39e24 100644 --- a/roles/ceph-rgw/tasks/docker/copy_configs.yml +++ b/roles/ceph-rgw/tasks/docker/copy_configs.yml @@ -2,7 +2,6 @@ - name: set config and keys paths set_fact: ceph_config_keys: - - /etc/ceph/{{ cluster }}.conf - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring - name: stat for ceph config and keys