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>
pull/1929/head
Sébastien Han 2017-09-20 16:33:29 +02:00
parent 7aab133617
commit cb05172605
8 changed files with 0 additions and 8 deletions

View File

@ -2,7 +2,6 @@
- name: set_fact ceph_config_keys - name: set_fact ceph_config_keys
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.conf
- /etc/ceph/{{ cluster }}.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring

View File

@ -2,7 +2,6 @@
- name: set_fact ceph_config_keys - name: set_fact ceph_config_keys
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.conf
- /etc/ceph/{{ cluster }}.mgr.{{ ansible_hostname }}.keyring - /etc/ceph/{{ cluster }}.mgr.{{ ansible_hostname }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys

View File

@ -2,7 +2,6 @@
- name: set_fact ceph_config_keys - name: set_fact ceph_config_keys
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.conf
- /etc/ceph/{{ cluster }}.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /etc/ceph/monmap-{{ cluster }} - /etc/ceph/monmap-{{ cluster }}
- /etc/ceph/{{ cluster }}.mon.keyring - /etc/ceph/{{ cluster }}.mon.keyring

View File

@ -2,7 +2,6 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.conf
- /etc/ceph/{{ cluster }}.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- /var/lib/ceph/radosgw/keyring - /var/lib/ceph/radosgw/keyring

View File

@ -2,7 +2,6 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.conf
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- name: wait for ceph.conf and keys - name: wait for ceph.conf and keys

View File

@ -8,7 +8,6 @@
- name: set_fact ceph_config_keys - name: set_fact ceph_config_keys
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.conf
- /etc/ceph/{{ cluster }}.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- "{{ bootstrap_rbd_keyring | default([]) }}" - "{{ bootstrap_rbd_keyring | default([]) }}"

View File

@ -2,7 +2,6 @@
- name: set_fact ceph_config_keys - name: set_fact ceph_config_keys
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.conf
- /etc/ceph/{{ cluster }}.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys

View File

@ -2,7 +2,6 @@
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.conf
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- name: stat for ceph config and keys - name: stat for ceph config and keys