From edb8d42596e1ab0625735460e86757184ffd7c5a Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 25 Jun 2019 10:23:57 +0200
Subject: [PATCH] nfs: remove duplicate task

This task is already present in pre_requisite_non_container.yml

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 roles/ceph-nfs/tasks/common.yml                   | 15 ---------------
 roles/ceph-nfs/tasks/main.yml                     |  3 ---
 .../tasks/pre_requisite_non_container.yml         |  3 ++-
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 roles/ceph-nfs/tasks/common.yml

diff --git a/roles/ceph-nfs/tasks/common.yml b/roles/ceph-nfs/tasks/common.yml
deleted file mode 100644
index cbdf5ec58..000000000
--- a/roles/ceph-nfs/tasks/common.yml
+++ /dev/null
@@ -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
diff --git a/roles/ceph-nfs/tasks/main.yml b/roles/ceph-nfs/tasks/main.yml
index 600da8522..80f614e52 100644
--- a/roles/ceph-nfs/tasks/main.yml
+++ b/roles/ceph-nfs/tasks/main.yml
@@ -4,9 +4,6 @@
     container_exec_cmd: "{{ container_binary }} exec ceph-nfs-{{ ansible_hostname }}"
   when: containerized_deployment | bool
 
-- name: include common.yml
-  include_tasks: common.yml
-
 - name: include pre_requisite_non_container.yml
   include_tasks: pre_requisite_non_container.yml
   when: not containerized_deployment | bool
diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
index 0a1e8e2ed..2d06c7a45 100644
--- a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
@@ -48,13 +48,14 @@
   block:
     - name: copy bootstrap cephx keys
       copy:
-        src: "{{ fetch_directory }}/{{ fsid }}{{ item.name }}"
+        src: "{{ fetch_directory }}/{{ fsid }}/{{ item.name }}"
         dest: "{{ item.name }}"
         owner: "ceph"
         group: "ceph"
         mode: "0600"
       with_items:
         - { 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
 
     - name: nfs object gateway related tasks