From 5a5c92d6488527ae2a068a8312432428b6f09b38 Mon Sep 17 00:00:00 2001 From: David Roble Date: Tue, 12 Sep 2017 23:53:53 -0400 Subject: [PATCH 1/2] remove default value for jenkins_user_uid, which is not needed for most installations --- cinch/roles/jenkins_common/defaults/main.yml | 7 +++++-- cinch/roles/jenkins_common/tasks/main.yml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cinch/roles/jenkins_common/defaults/main.yml b/cinch/roles/jenkins_common/defaults/main.yml index 212df7e..867e5e1 100644 --- a/cinch/roles/jenkins_common/defaults/main.yml +++ b/cinch/roles/jenkins_common/defaults/main.yml @@ -5,8 +5,11 @@ jenkins_ssh_keyfile: id_rsa # 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 index 80ba4b2..159ba39 100644 --- 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: From 1127974d68baf16747440bcb3640f4335166bd05 Mon Sep 17 00:00:00 2001 From: David Roble Date: Wed, 13 Sep 2017 10:17:58 -0400 Subject: [PATCH 2/2] added Jenkins user UID to jenkins_docker_slave group_vars for the OpenShift use case --- cinch/group_vars/jenkins_docker_slave | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cinch/group_vars/jenkins_docker_slave b/cinch/group_vars/jenkins_docker_slave index d10c5af..0ecbc08 100644 --- 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