Merge pull request #1849 from ceph/client-external

client: do not copy admin key by default
2017-09-02 00:57:24 +02:00 · 2017-09-02 00:57:24 +02:00 · 7e954f5bc0
parent 5b3ba28607 23a0c26c4f
commit 7e954f5bc0
3 changed files with 5 additions and 3 deletions
--- a/group_vars/clients.yml.sample
+++ b/group_vars/clients.yml.sample
@ -11,7 +11,7 @@ dummy:
 # GENERAL #
 ###########

-#fetch_directory: fetch/
+#copy_admin_key: false

 #user_config: false
 #pools:
--- a/roles/ceph-client/defaults/main.yml
+++ b/roles/ceph-client/defaults/main.yml
@ -3,7 +3,7 @@
 # GENERAL #
 ###########

-fetch_directory: fetch/
+copy_admin_key: false

 user_config: false
 pools:
--- a/roles/ceph-client/tasks/pre_requisite.yml
+++ b/roles/ceph-client/tasks/pre_requisite.yml
@ -6,7 +6,9 @@
    owner: "ceph"
    group: "ceph"
    mode: "0600"
-  when: cephx
+  when:
+    - cephx
+    - copy_admin_key

 - name: check if global key exists in ceph_conf_overrides
  set_fact: