From: Sébastien Han <seb@redhat.com>
Date: Thu, 25 Feb 2016 11:10:45 +0000 (+0100)
Subject: ceph-: update group_vars to reflect previous change
X-Git-Tag: v1.0.0~14^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=51e4fe8e0ba406e064a92929519a93313db1f881;p=ceph-ansible.git

ceph-: update group_vars to reflect previous change

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/group_vars/mdss.sample b/group_vars/mdss.sample
index fae7bc279..5039b3b9f 100644
--- a/group_vars/mdss.sample
+++ b/group_vars/mdss.sample
@@ -10,6 +10,11 @@ dummy:
 
 #fetch_directory: fetch/
 
+# Even though MDS nodes should not have the admin key
+# at their disposal, some people might want to have it
+# distributed on MDS nodes. Setting 'copy_admin_key' to 'true'
+# will copy the admin key to the /etc/ceph/ directory
+# copy_admin_key: false
 
 ##########
 # DOCKER #
diff --git a/group_vars/osds.sample b/group_vars/osds.sample
index 1af7191e8..66904a7b1 100644
--- a/group_vars/osds.sample
+++ b/group_vars/osds.sample
@@ -11,6 +11,12 @@ dummy:
 
 #fetch_directory: fetch/
 
+# Even though OSD nodes should not have the admin key
+# at their disposal, some people might want to have it
+# distributed on OSD nodes. Setting 'copy_admin_key' to 'true'
+# will copy the admin key to the /etc/ceph/ directory
+#copy_admin_key: false
+
 ####################
 # OSD CRUSH LOCATION
 ####################
diff --git a/group_vars/rgws.sample b/group_vars/rgws.sample
index 707c36116..8ec233ca8 100644
--- a/group_vars/rgws.sample
+++ b/group_vars/rgws.sample
@@ -9,6 +9,12 @@ dummy:
 #
 #cephx: true
 
+# Even though RGW nodes should not have the admin key
+# at their disposal, some people might want to have it
+# distributed on RGW nodes. Setting 'copy_admin_key' to 'true'
+# will copy the admin key to the /etc/ceph/ directory
+# copy_admin_key: false
+
 # Used for the sudo exception while starting the radosgw process
 # a new entry /etc/sudoers.d/ceph will be created
 # allowing root to not require tty
diff --git a/roles/ceph-mds/tasks/pre_requisite.yml b/roles/ceph-mds/tasks/pre_requisite.yml
index 966e45872..ede48415a 100644
--- a/roles/ceph-mds/tasks/pre_requisite.yml
+++ b/roles/ceph-mds/tasks/pre_requisite.yml
@@ -10,16 +10,16 @@
 - name: copy mds bootstrap key
   copy:
     src: "{{ fetch_directory }}/{{ fsid }}{{ item.name }}"
-    dest: "{{ item }}"
+    dest: "{{ item.name }}"
     owner: "{{ key_owner }}"
     group: "{{ key_group }}"
     mode: "{{ key_mode }}"
   with_items:
-    - { name: /var/lib/ceph/bootstrap-mds/ceph.keyring, copy: true }
-    - { name: /etc/ceph/client.admin.keyring, "{{ copy_admin_key }}" }
+    - { name: /var/lib/ceph/bootstrap-mds/ceph.keyring, copy_key: true }
+    - { name: /etc/ceph/ceph.client.admin.keyring, copy_key: "{{ copy_admin_key }}" }
   when:
     cephx and
-    item.copy is true
+    item.copy_key|bool
 
 - name: create mds directory
   file:
diff --git a/roles/ceph-osd/tasks/pre_requisite.yml b/roles/ceph-osd/tasks/pre_requisite.yml
index 12fe9a571..61b9395a8 100644
--- a/roles/ceph-osd/tasks/pre_requisite.yml
+++ b/roles/ceph-osd/tasks/pre_requisite.yml
@@ -24,13 +24,13 @@
 - name: copy osd bootstrap key
   copy:
     src: "{{ fetch_directory }}/{{ fsid }}{{ item.name }}"
-    dest: "{{ item }}"
+    dest: "{{ item.name }}"
     owner: "{{ key_owner }}"
     group: "{{ key_group }}"
     mode: "{{ key_mode }}"
   with_items:
-    - { name: /var/lib/ceph/bootstrap-osd/ceph.keyring, copy: true }
-    - { name: /etc/ceph/client.admin.keyring, "{{ copy_admin_key }}" }
+    - { name: /var/lib/ceph/bootstrap-osd/ceph.keyring, copy_key: true }
+    - { name: /etc/ceph/ceph.client.admin.keyring, copy_key: "{{ copy_admin_key }}" }
   when:
     cephx and
-    item.copy is true
+    item.copy_key|bool
diff --git a/roles/ceph-rgw/tasks/pre_requisite.yml b/roles/ceph-rgw/tasks/pre_requisite.yml
index a546774f6..8b24a271e 100644
--- a/roles/ceph-rgw/tasks/pre_requisite.yml
+++ b/roles/ceph-rgw/tasks/pre_requisite.yml
@@ -13,16 +13,16 @@
 - name: copy rados gateway bootstrap key
   copy:
     src: "{{ fetch_directory }}/{{ fsid }}{{ item.name }}"
-    dest: "{{ item }}"
+    dest: "{{ item.name }}"
     owner: "{{ key_owner }}"
     group: "{{ key_group }}"
     mode: "{{ key_mode }}"
   with_items:
-    - { name: /var/lib/ceph/bootstrap-rgw/ceph.keyring, copy: true }
-    - { name: /etc/ceph/client.admin.keyring, "{{ copy_admin_key }}" }
+    - { name: /var/lib/ceph/bootstrap-rgw/ceph.keyring, copy_key: true }
+    - { name: /etc/ceph/ceph.client.admin.keyring, copy_key: "{{ copy_admin_key }}" }
   when:
     cephx and
-    item.copy is true
+    item.copy_key|bool
 
 - name: create rados gateway keyring
   command: ceph --cluster ceph --name client.bootstrap-rgw --keyring /var/lib/ceph/bootstrap-rgw/ceph.keyring auth get-or-create client.rgw.{{ ansible_hostname }} osd 'allow rwx' mon 'allow rw' -o /var/lib/ceph/radosgw/ceph-rgw.{{ ansible_hostname }}/keyring