docker: we don't need to copy the ceph.conf on all the nodes

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 <seb@redhat.com>

diff --git a/roles/ceph-mds/tasks/docker/copy_configs.yml b/roles/ceph-mds/tasks/docker/copy_configs.yml
index 62c6ec3bc00c84fba1ebe4a30d43fc496d8d6b8b..022e114d140ead102d60b1ad10b69724e7ec3e71 100644 (file)
--- 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 8ce8b64a05ed6e96b3fbea4a27d9d3072f7dcf77..5a371b19fbf5218d7593c364d62d35b96d972aa7 100644 (file)
--- 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 123dc36d9eb0f9fa84d3ba28926e2ed3022c291e..9d04704d877e95cb4567505fd842852016da5a5e 100644 (file)
--- 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 ed69e2cb6172db043a84cf7bd11f9c2502ec396b..9686111b15b6923094476194bcb40727d73321d3 100644 (file)
--- 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 2501f5bbf232e0b18a0f37394485c666bf5b4ae7..9a9e1dc70f6f2f4fed51624a546e86acaa08c575 100644 (file)
--- 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 3f50d879e98ab639bd60e59c96257d71fb279a6c..87704ed268ec33123f5da3d1f4c021742693d413 100644 (file)
--- 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 2ecb548bba7afc19eae0f0e6a30643d051abdb71..dbc979dac1851f4f53a91690e8420eae7d985668 100644 (file)
--- 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 312cadfdbd163dfcbb8e10ba275c57b16deb2209..6daa39e248ca77fb606d063b193b831d5a4a8106 100644 (file)
--- 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