From ca218a60916bc0afc5177d9a09e6e4e80abdba23 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 8 Dec 2015 14:01:33 -0500 Subject: [PATCH] Add git user.name and git user.email settings Change-Id: I60556ea635826d9893391002eeab88b10e45f23e Signed-off-by: Paul Belanger --- README.rst | 13 +++++++++++++ defaults/main.yaml | 2 ++ templates/etc/zuul/zuul.conf.j2 | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/README.rst b/README.rst index 45994cb..5f5d542 100644 --- a/README.rst +++ b/README.rst @@ -68,6 +68,19 @@ Role Variables # Default: /var/lib/zuul zuul_user_home: /var/lib/zuul +Zuul Merger Configuration +~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: yaml + + # Value to pass to git config user.email. + # Default: Empty + zuul_config_merger_git_user_email: "" + + # Value to pass to git config user.name. + # Default: Empty + zuul_config_merger_git_user_name: "" + Dependencies ------------ diff --git a/defaults/main.yaml b/defaults/main.yaml index 990e8cf..7894a60 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -33,6 +33,8 @@ zuul_config_gerrit_sshkey: "{{ zuul_user_home }}/.ssh/id_rsa" zuul_config_gerrit_user: zuul zuul_config_merger_git_dir: "{{ zuul_user_home }}/git" +zuul_config_merger_git_user_email: "" +zuul_config_merger_git_user_name: "" zuul_config_merger_log_config: /etc/zuul/merger-logging.conf zuul_config_merger_zuul_url: 127.0.0.1 diff --git a/templates/etc/zuul/zuul.conf.j2 b/templates/etc/zuul/zuul.conf.j2 index b45424f..efb9824 100644 --- a/templates/etc/zuul/zuul.conf.j2 +++ b/templates/etc/zuul/zuul.conf.j2 @@ -20,6 +20,12 @@ state_dir = {{ zuul_config_zuul_state_dir }} [merger] git_dir = {{ zuul_config_merger_git_dir }} +{% if zuul_config_merger_git_user_email != "" %} +git_user_email = {{ zuul_config_merger_git_user_email }} +{%endif %} +{% if zuul_config_merger_git_user_name != "" %} +git_user_name = {{ zuul_config_merger_git_user_name }} +{%endif %} log_config = {{ zuul_config_merger_log_config }} zuul_url = {{ zuul_config_merger_zuul_url }}