From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 26 Jun 2015 21:42:25 +0000 (-0700)
Subject: Change 'ssh_keys' to 'ansible_user_ssh_keys' to clarify usage
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F60%2Fhead;p=ceph-cm-ansible.git

Change 'ssh_keys' to 'ansible_user_ssh_keys' to clarify usage

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/roles/ansible-managed/tasks/main.yml b/roles/ansible-managed/tasks/main.yml
index 277397f6..9cf4adc0 100644
--- a/roles/ansible-managed/tasks/main.yml
+++ b/roles/ansible-managed/tasks/main.yml
@@ -49,6 +49,6 @@
   authorized_key: 
     user: "{{ ansible_user }}"
     key: "{{ item }}"
-  with_items: ssh_keys
+  with_items: ansible_user_ssh_keys
   tags:
     - pubkeys
diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index 88caa67d..222ab8c0 100644
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -24,7 +24,7 @@ scripts:
 triggers:
   - install/post/cephlab_ansible.sh
 
-ssh_keys: []
+ansible_user_ssh_keys: []
 
 ansible_user: ''
 ansible_user_uid_: ''
diff --git a/roles/cobbler/templates/snippets/cephlab_user b/roles/cobbler/templates/snippets/cephlab_user
index 456ce473..5b0a93d1 100644
--- a/roles/cobbler/templates/snippets/cephlab_user
+++ b/roles/cobbler/templates/snippets/cephlab_user
@@ -18,7 +18,7 @@ chmod 0440 /etc/sudoers.d/cephlab_sudo
 install -d -m0755 --owner=$user --group=$user /home/$user/.ssh 
 
 cat >> $auth_keys << EOF
-{% for key in ssh_keys %}
+{% for key in ansible_user_ssh_keys %}
 {{ key }}
 {% endfor %}
 EOF