Set the uid of the ansible user in cephlab_trusty.preseed.

We need to explicitly set this uid here just like we do in the
cephlab_user snippet. I also created a var for the uid because we need it in
multiple places.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/cobbler/templates/kickstarts/cephlab_trusty.preseed b/roles/cobbler/templates/kickstarts/cephlab_trusty.preseed
index b19578c74def7d53def5e5981237bc344d3454dd..bc17a6aa0e9b6ca36436b3e6745b6616ceb11a60 100755 (executable)
--- a/roles/cobbler/templates/kickstarts/cephlab_trusty.preseed
+++ b/roles/cobbler/templates/kickstarts/cephlab_trusty.preseed
@@ -74,7 +74,7 @@ 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-password-crypted password $default_password_crypted
-d-i passwd/user-uid string 
+d-i passwd/user-uid string {{ ansible_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 c22e6086dcfb5061105da3847a272d29306c9048..d85ad82abb5268e02df1be214e050706d65ad246 100644 (file)
--- a/roles/cobbler/templates/snippets/cephlab_user
+++ b/roles/cobbler/templates/snippets/cephlab_user
@@ -3,7 +3,7 @@
 #set $home = '/home/' + $user
 #set $auth_keys = $home + '/.ssh/authorized_keys'
 groupadd sudo
-useradd -u 1100 -G sudo $user
+useradd -u {{ ansible_user_uid_ }} -G sudo $user
 passwd -d $user
 
 cat >> /etc/sudoers.d/cephlab_sudo << EOF