Skip to content

Commit 16f6476

Browse files
Merge pull request #164 from robled/jenkins_user_uid_fix
remove default value for jenkins_user_uid, which is not needed for mo…
2 parents 2469edd + 1127974 commit 16f6476

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

cinch/group_vars/jenkins_docker_slave

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
repositories: "{{ jenkins_slave_repositories }}"
22

33
download_repositories: "{{ jenkins_slave_download_repositories }}"
4+
5+
# For certain OpenShift instances a value of '1000090000' is recommended.
6+
jenkins_user_uid: 1000090000

cinch/roles/jenkins_common/defaults/main.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
# supported beyond the EOL support for their packages in the distribution of
33
# choice
44
java_version: 8
5-
# Needed for certain OpenShift instances
6-
jenkins_user_uid: 1000090000
5+
# Optionally set the 'jenkins' Unix account UID here. This should not normally
6+
# need to be changed, but for certain OpenShift instances a value of
7+
# '1000090000' is recommended.
8+
#jenkins_user_uid: 1000090000
9+
710
# Set the default (empty) set of authorized SSH public keys for jenkins user.
811
# To add authorized keys, override this value by adding a list of paths
912
# (relative or full) to files containing separate public keys.

cinch/roles/jenkins_common/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
password: "{{ jenkins_user_password }}"
3232
home: "{{ jenkins_user_home }}"
3333
shell: /bin/bash
34-
uid: "{{ jenkins_user_uid }}"
34+
uid: "{{ jenkins_user_uid | default(omit) }}"
3535

3636
- name: ensure SSH directory exists
3737
file:

0 commit comments

Comments
 (0)