Default jenkins user uid and group gid to None

playbooks/roles/jenkins_build/defaults/main.yml

+build_jenkins_user_uid: 1002
+build_jenkins_group_gid: 1004
 build_jenkins_version: jenkins_1.651.3
 build_jenkins_jvm_args: '-Djava.awt.headless=true -Xmx8192m'
 build_jenkins_configuration_scripts:

playbooks/roles/jenkins_build/meta/main.yml

@@ -3,6 +3,8 @@ dependencies:
   - common
   - role: jenkins_common
     jenkins_common_version: '{{ build_jenkins_version }}'
+    jenkins_common_user_uid: '{{ build_jenkins_user_uid }}'
+    jenkins_common_group_gid: '{{ build_jenkins_group_gid }}'
     jenkins_common_jvm_args: '{{ build_jenkins_jvm_args }}'
     jenkins_common_configuration_scripts: '{{ build_jenkins_configuration_scripts }}'
     jenkins_common_template_files: '{{ build_jenkins_template_files }}'

playbooks/roles/jenkins_common/defaults/main.yml

 jenkins_common_user: jenkins
-jenkins_common_user_uid: 1002
 jenkins_common_group: jenkins
-jenkins_common_group_gid: 1004
 jenkins_common_home: /var/lib/jenkins
 jenkins_common_config_path: /var/lib/jenkins/init-configs
 jenkins_common_port: 8080

playbooks/roles/jenkins_common/tasks/main.yml

@@ -10,20 +10,42 @@
     - install
     - install:system-requirements
 
-- name: Create jenkins group
+- name: Create jenkins group with specified gid
   group:
     name: '{{ jenkins_common_group }}'
     gid: '{{ jenkins_common_group_gid }}'
     state: present
+  when: jenkins_common_group_gid is defined
+  tags:
+    - install
+    - install:system-requirements
+
+- name: Create jenkins group
+  group:
+    name: '{{ jenkins_common_group }}'
+    state: present
+  when: jenkins_common_group_gid is not defined or not jenkins_common_group_gid
   tags:
     - install
     - install:system-requirements
 
-- name: Add the jenkins user to the group
+- name: Create the jenkins user with specified uid and add to the group
   user:
     name: '{{ jenkins_common_user }}'
+    append: yes
     uid: '{{ jenkins_common_user_uid }}'
     groups: '{{ jenkins_common_group }}'
+  when: jenkins_common_user_uid is defined
+  tags:
+    - install
+    - install:system-requirements
+
+- name: Create the jenkins user and add to the group
+  user:
+    name: '{{ jenkins_common_user }}'
+    append: yes
+    groups: '{{ jenkins_common_group }}'
+  when: jenkins_common_user_uid is not defined or not jenkins_common_user_uid
   tags:
     - install
     - install:system-requirements