Merge pull request #164 from robled/jenkins_user_uid_fix

remove default value for jenkins_user_uid, which is not needed for mo…
RedHatQE · Sep 13, 2017 · 16f6476 · 16f6476
2 parents 2469edd + 1127974
commit 16f6476
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/cinch/group_vars/jenkins_docker_slave b/cinch/group_vars/jenkins_docker_slave
@@ -1,3 +1,6 @@
 repositories: "{{ jenkins_slave_repositories }}"
 
 download_repositories: "{{ jenkins_slave_download_repositories }}"
+
+# For certain OpenShift instances a value of '1000090000' is recommended.
+jenkins_user_uid: 1000090000
diff --git a/cinch/roles/jenkins_common/defaults/main.yml b/cinch/roles/jenkins_common/defaults/main.yml
@@ -2,8 +2,11 @@
 # supported beyond the EOL support for their packages in the distribution of
 # choice
 java_version: 8
-# Needed for certain OpenShift instances
-jenkins_user_uid: 1000090000
+# Optionally set the 'jenkins' Unix account UID here.  This should not normally
+# need to be changed, but for certain OpenShift instances a value of
+# '1000090000' is recommended.
+#jenkins_user_uid: 1000090000
+
 # Set the default (empty) set of authorized SSH public keys for jenkins user.
 # To add authorized keys, override this value by adding a list of paths
 # (relative or full) to files containing separate public keys.

diff --git a/cinch/roles/jenkins_common/tasks/main.yml b/cinch/roles/jenkins_common/tasks/main.yml
@@ -31,7 +31,7 @@
     password: "{{ jenkins_user_password }}"
     home: "{{ jenkins_user_home }}"
     shell: /bin/bash
-    uid: "{{ jenkins_user_uid }}"
+    uid: "{{ jenkins_user_uid | default(omit) }}"
 
 - name: ensure SSH directory exists
   file: