From: Zack Cerza <zack@redhat.com>
Date: Tue, 16 Feb 2016 22:07:34 +0000 (-0700)
Subject: Rename ansible_user to cm_user
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3f327f00411383a07701884b7f7bc18caea9974f;p=ceph-cm-ansible.git

Rename ansible_user to cm_user

ansible_user is now used by ansible itself.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/roles/ansible-managed/tasks/main.yml b/roles/ansible-managed/tasks/main.yml
index 0482a7b..64f3733 100644
--- a/roles/ansible-managed/tasks/main.yml
+++ b/roles/ansible-managed/tasks/main.yml
@@ -8,18 +8,18 @@
 
 - name: Create the ansible user.
   user:
-    name: "{{ ansible_user }}"
+    name: "{{ cm_user }}"
     groups: sudo
     shell: /bin/bash
-    uid: "{{ ansible_user_uid_ }}"
+    uid: "{{ cm_user_uid }}"
     update_password: on_create
-  when: ansible_user is defined and ansible_user_uid_ is defined
+  when: cm_user is defined and cm_user_uid is defined
   register: user_created
   tags:
    - user
 
 - name: Delete the ansible users password.
-  command: "passwd -d {{ ansible_user }}"
+  command: "passwd -d {{ cm_user }}"
   when: user_created is defined and user_created|changed
   tags:
    - user
@@ -48,10 +48,10 @@
 
 - name: Add authorized keys for the ansible user.
   authorized_key: 
-    user: "{{ ansible_user }}"
+    user: "{{ cm_user }}"
     key: "{{ item }}"
-  with_items: ansible_user_ssh_keys
-  when: ansible_user_ssh_keys is defined and
-        ansible_user is defined
+  with_items: cm_user_ssh_keys
+  when: cm_user_ssh_keys is defined and
+        cm_user is defined
   tags:
     - pubkeys
diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index 99a7502..50fcfe2 100644
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -53,10 +53,10 @@ utils:
   - reboot.sh
   - reimage.sh
 
-ansible_user_ssh_keys: []
+cm_user_ssh_keys: []
 
-ansible_user: ''
-ansible_user_uid_: ''
+cm_user: ''
+cm_user_uid: ''
 
 # A list of lines to add to resolv.conf and resolv.conf.d/base
 # An example:
diff --git a/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed b/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed
index 067f5eb..dc46aa1 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed
+++ b/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed
@@ -78,10 +78,10 @@ d-i grub-pc/install_devices multiselect /dev/sda
 #User account.
 d-i passwd/root-login boolean false 
 d-i passwd/make-user boolean true
-d-i passwd/user-fullname string {{ ansible_user }}
-d-i passwd/username string {{ ansible_user }}
+d-i passwd/user-fullname string {{ cm_user }}
+d-i passwd/username string {{ cm_user }}
 d-i passwd/user-password-crypted password $default_password_crypted
-d-i passwd/user-uid string {{ ansible_user_uid_ }}
+d-i passwd/user-uid string {{ cm_user_uid }}
 d-i user-setup/allow-password-weak boolean false
 d-i user-setup/encrypt-home boolean false
 
diff --git a/roles/cobbler/templates/snippets/cephlab_user b/roles/cobbler/templates/snippets/cephlab_user
index 5b0a93d..983cce7 100644
--- a/roles/cobbler/templates/snippets/cephlab_user
+++ b/roles/cobbler/templates/snippets/cephlab_user
@@ -1,9 +1,9 @@
 ## {{ ansible_managed }}
-#set $user = '{{ ansible_user }}'
+#set $user = '{{ cm_user }}'
 #set $home = '/home/' + $user
 #set $auth_keys = $home + '/.ssh/authorized_keys'
 groupadd sudo
-useradd -u {{ ansible_user_uid_ }} -G sudo $user
+useradd -u {{ cm_user_uid }} -G sudo $user
 passwd -d $user
 
 cat >> /etc/sudoers.d/cephlab_sudo << EOF
@@ -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 ansible_user_ssh_keys %}
+{% for key in cm_user_ssh_keys %}
 {{ key }}
 {% endfor %}
 EOF