windmill/ansible-role-zuul
Code Issues Proposed changes

Add git user.name and git user.email settings

Browse Source 
Change-Id: I60556ea635826d9893391002eeab88b10e45f23e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-12-08 14:01:33 -05:00
parent 7d79d724ed
commit ca218a6091
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.rst
View File

@ -68,6 +68,19 @@ Role Variables
# Default: /var/lib/zuul # Default: /var/lib/zuul
zuul_user_home: /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 Dependencies
------------ ------------

2
defaults/main.yaml
View File

@ -33,6 +33,8 @@ zuul_config_gerrit_sshkey: "{{ zuul_user_home }}/.ssh/id_rsa"
zuul_config_gerrit_user: zuul zuul_config_gerrit_user: zuul
zuul_config_merger_git_dir: "{{ zuul_user_home }}/git" 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_log_config: /etc/zuul/merger-logging.conf
zuul_config_merger_zuul_url: 127.0.0.1 zuul_config_merger_zuul_url: 127.0.0.1

6
templates/etc/zuul/zuul.conf.j2
View File

@ -20,6 +20,12 @@ state_dir = {{ zuul_config_zuul_state_dir }}
[merger] [merger]
git_dir = {{ zuul_config_merger_git_dir }} 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 }} log_config = {{ zuul_config_merger_log_config }}
zuul_url = {{ zuul_config_merger_zuul_url }} zuul_url = {{ zuul_config_merger_zuul_url }}