mirror of https://github.com/ceph/ceph-ansible.git
nfs: remove duplicate task
This task is already present in pre_requisite_non_container.yml Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>pull/4128/head
parent
013ae62177
commit
edb8d42596
|
@ -1,15 +0,0 @@
|
||||||
---
|
|
||||||
- name: copy ceph keyring(s) if needed
|
|
||||||
copy:
|
|
||||||
src: "{{ fetch_directory }}/{{ fsid }}/{{ item.name }}"
|
|
||||||
dest: "{{ item.name }}"
|
|
||||||
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
|
||||||
group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
|
|
||||||
mode: "{{ ceph_keyring_permissions }}"
|
|
||||||
with_items:
|
|
||||||
- { name: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: true }
|
|
||||||
- { name: "/etc/ceph/{{ cluster }}.client.admin.keyring", copy_key: "{{ copy_admin_key }}" }
|
|
||||||
when:
|
|
||||||
- cephx | bool
|
|
||||||
- item.copy_key | bool
|
|
||||||
- groups.get(mon_group_name, []) | length > 0
|
|
|
@ -4,9 +4,6 @@
|
||||||
container_exec_cmd: "{{ container_binary }} exec ceph-nfs-{{ ansible_hostname }}"
|
container_exec_cmd: "{{ container_binary }} exec ceph-nfs-{{ ansible_hostname }}"
|
||||||
when: containerized_deployment | bool
|
when: containerized_deployment | bool
|
||||||
|
|
||||||
- name: include common.yml
|
|
||||||
include_tasks: common.yml
|
|
||||||
|
|
||||||
- name: include pre_requisite_non_container.yml
|
- name: include pre_requisite_non_container.yml
|
||||||
include_tasks: pre_requisite_non_container.yml
|
include_tasks: pre_requisite_non_container.yml
|
||||||
when: not containerized_deployment | bool
|
when: not containerized_deployment | bool
|
||||||
|
|
|
@ -48,13 +48,14 @@
|
||||||
block:
|
block:
|
||||||
- name: copy bootstrap cephx keys
|
- name: copy bootstrap cephx keys
|
||||||
copy:
|
copy:
|
||||||
src: "{{ fetch_directory }}/{{ fsid }}{{ item.name }}"
|
src: "{{ fetch_directory }}/{{ fsid }}/{{ item.name }}"
|
||||||
dest: "{{ item.name }}"
|
dest: "{{ item.name }}"
|
||||||
owner: "ceph"
|
owner: "ceph"
|
||||||
group: "ceph"
|
group: "ceph"
|
||||||
mode: "0600"
|
mode: "0600"
|
||||||
with_items:
|
with_items:
|
||||||
- { name: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: "{{ nfs_obj_gw }}" }
|
- { name: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: "{{ nfs_obj_gw }}" }
|
||||||
|
- { name: "/etc/ceph/{{ cluster }}.client.admin.keyring", copy_key: "{{ copy_admin_key }}" }
|
||||||
when: item.copy_key | bool
|
when: item.copy_key | bool
|
||||||
|
|
||||||
- name: nfs object gateway related tasks
|
- name: nfs object gateway related tasks
|
||||||
|
|
Loading…
Reference in New Issue