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 277397f6267d583202fc2d7352e77499eda82eda..9cf4adc04c7f54d09763217b724ae809f7f7b478 100644 (file)
--- 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 88caa67d7f4c2edf2d645109028913659c70a1e8..222ab8c0a7fe206faee3bfe7a4ee6ac8bf45bbfc 100644 (file)
--- 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 456ce4730d8bd8b3e5d7e5d186a7a94723cf3f45..5b0a93d19ed6847bc8b10a99367d68aa4c65f09d 100644 (file)
--- 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