From 6a5e04505880cecc232d32e70b96e61f07f57621 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 18 Dec 2015 10:37:51 -0500 Subject: [PATCH] Expand jenkins_job_builder_template_jenkins_jobs_ini settings Add support for group and owner settings. Change-Id: I65abc89ea70794f0dea34a0a8b9d0d53f412760e Signed-off-by: Paul Belanger --- defaults/main.yaml | 4 +++- tasks/config.yaml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index a16bc4e..b2bd074 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -14,7 +14,7 @@ --- # tasks/config.yaml jenkins_job_builder_user_name: root -jenkins_job_builder_user_group: "{{ jenkins_job_builder_user_name }}" +jenkins_job_builder_user_group: root jenkins_job_builder_config_job_builder_allow_duplicates: False jenkins_job_builder_config_job_builder_ignore_cache: True @@ -27,7 +27,9 @@ jenkins_job_builder_config_jenkins_url: http://localhost:8008 jenkins_job_builder_config_jenkins_query_plugins_info: False jenkins_job_builder_template_jenkins_jobs_ini_dest: /etc/jenkins_jobs/jenkins_jobs.ini +jenkins_job_builder_template_jenkins_jobs_ini_group: "{{ jenkins_job_builder_user_group }}" jenkins_job_builder_template_jenkins_jobs_ini_mode: "0440" +jenkins_job_builder_template_jenkins_jobs_ini_owner: "{{ jenkins_job_builder_user_name }}" jenkins_job_builder_template_jenkins_jobs_ini_src: etc/jenkins_jobs/jenkins_jobs.ini.j2 # tasks/install.yaml diff --git a/tasks/config.yaml b/tasks/config.yaml index 479f1ef..ae519d4 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -24,7 +24,7 @@ - name: Template jenkins_jobs.ini file. template: dest: "{{ jenkins_job_builder_template_jenkins_jobs_ini_dest }}" - group: "{{ jenkins_job_builder_user_group }}" + group: "{{ jenkins_job_builder_template_jenkins_jobs_ini_group }}" mode: "{{ jenkins_job_builder_template_jenkins_jobs_ini_mode }}" - owner: "{{ jenkins_job_builder_user_name }}" + owner: "{{ jenkins_job_builder_template_jenkins_jobs_ini_owner }}" src: "{{ jenkins_job_builder_template_jenkins_jobs_ini_src }}"