mirror of https://github.com/ceph/ceph-ansible.git
docker: fix keyrings copied on all nodes
All keyring are getting copied to all nodes. This commit fixes a leftover from a previous code refactor. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1498583 Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>pull/1988/head
parent
163c87af79
commit
70e2787fe2
|
@ -1 +0,0 @@
|
|||
---
|
|
@ -1,17 +0,0 @@
|
|||
---
|
||||
- name: include stat_ceph_files.yml
|
||||
include: stat_ceph_files.yml
|
||||
|
||||
- name: try to fetch ceph config and keys
|
||||
copy:
|
||||
src: "{{ fetch_directory }}/{{ fsid }}/{{ item.0 }}"
|
||||
dest: "{{ item.0 }}"
|
||||
owner: root
|
||||
group: root
|
||||
mode: 0600
|
||||
changed_when: false
|
||||
with_together:
|
||||
- "{{ ceph_config_keys }}"
|
||||
- "{{ statconfig.results | default([]) }}"
|
||||
when:
|
||||
- item.1.stat.exists == true
|
|
@ -104,9 +104,6 @@
|
|||
- name: include dirs_permissions.yml
|
||||
include: dirs_permissions.yml
|
||||
|
||||
- name: include create_configs.yml
|
||||
include: create_configs.yml
|
||||
|
||||
- name: include selinux.yml
|
||||
include: selinux.yml
|
||||
when:
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
|
||||
- /var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring
|
||||
|
||||
- name: register rbd bootstrap key
|
||||
set_fact:
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
- name: set config and keys paths
|
||||
set_fact:
|
||||
ceph_config_keys:
|
||||
- /etc/ceph/{{ cluster }}.client.admin.keyring
|
||||
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
|
||||
|
||||
- name: stat for config and keys
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
|
||||
|
||||
- name: wait for ceph.conf and keys
|
||||
local_action: wait_for path={{ fetch_directory }}/{{ fsid }}/{{ item.0 }}
|
||||
local_action: wait_for path={{ fetch_directory }}/{{ fsid }}/{{ item }}
|
||||
become: false
|
||||
with_items: "{{ ceph_config_keys }}"
|
||||
|
||||
|
@ -20,8 +20,8 @@
|
|||
|
||||
- name: try to copy ceph config and keys
|
||||
copy:
|
||||
src: "{{ fetch_directory }}/{{ fsid }}/{{ item.0 }}"
|
||||
dest: "{{ item.0 }}"
|
||||
src: "{{ fetch_directory }}/{{ fsid }}/{{ item }}"
|
||||
dest: "{{ item }}"
|
||||
owner: root
|
||||
group: root
|
||||
mode: 0644
|
||||
|
|
Loading…
Reference in New Issue