Merge branch 'master' of /git/ansible

This commit is contained in:
Kevin Fenzi 2014-12-06 21:07:58 +00:00
commit bfa34f77d2

View file

@ -3,15 +3,10 @@ clean_up_on_failure = {{clean_up_on_failure}}
delete_image_on_failure = {{delete_image_on_failure}}
[koji]
{% if env == 'staging' %}
server = https://koji.stg.fedoraproject.org/kojihub
# The two adjacent slashes in the below URL are _not_ a typo.
base_task_url = https://kojipkgs.stg.fedoraproject.org//work/tasks
{% else %}
# Use prod Koji all the time since there are no createImage builds in stg
server = https://koji.fedoraproject.org/kojihub
# The two adjacent slashes in the below URL are _not_ a typo.
base_task_url = https://kojipkgs.fedoraproject.org//work/tasks
{% endif %}
[aws]
util_username = {{aws_util_username}}