Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fix osbs-client role templating

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-11-23 21:47:44 +00:00
parent 074f018c19
commit 1bee593de6
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
roles/osbs-client/defaults/main.yml
View file

@ -33,3 +33,6 @@ default:
registry_api_versions: v2
builder_openshift_url: https://172.17.0.1:8443/
koji_certs_secret: false
use_kerberos: false
kerberos_keytab: ""
kerberos_principal: ""

24
roles/osbs-client/templates/osbs.conf.j2
View file

@ -4,22 +4,22 @@ build_json_dir = {{ general.build_json_dir }}
openshift_required_version = {{ general.openshift_required_version }}
[default]
{% if default.username %}
{% if default.username is defined %}
username = {{ default.username }}
{% endif %}
{% if default.password %}
{% if default.password is defined %}
password = {{ default.password }}
{% endif %}
{% if default.koji_certs_secret %}
{% if default.koji_certs_secret is defined %}
koji_certs_secret = {{ default.koji_certs_secret }}
{% endif %}
{% if default.use_kerberos %}
{% if default.use_kerberos is defined %}
use_kerberos = {{ default.use_kerberos }}
{% endif %}
{% if default.kerberos_keytab %}
{% if default.kerberos_keytab is defined %}
kerberos_keytab = {{ default.kerberos_keytab }}
{% endif %}
{% if default.kerberos_principal %}
{% if default.kerberos_principal is defined %}
kerberos_principal = {{ default.kerberos_principal }}
{% endif %}
openshift_url = {{ default.openshift_url }}
@ -41,22 +41,22 @@ builder_openshift_url = {{ default.builder_openshift_url }}
[scratch]
scratch = true
{% if default.username %}
{% if default.username is defined %}
username = {{ default.username }}
{% endif %}
{% if default.password %}
{% if default.password is defined %}
password = {{ default.password }}
{% endif %}
{% if default.koji_certs_secret %}
{% if default.koji_certs_secret is defined %}
koji_certs_secret = {{ default.koji_certs_secret }}
{% endif %}
{% if default.use_kerberos %}
{% if default.use_kerberos is defined %}
use_kerberos = {{ default.use_kerberos }}
{% endif %}
{% if default.kerberos_keytab %}
{% if default.kerberos_keytab is defined %}
kerberos_keytab = {{ default.kerberos_keytab }}
{% endif %}
{% if default.kerberos_principal %}
{% if default.kerberos_principal is defined %}
kerberos_principal = {{ default.kerberos_principal }}
{% endif %}
openshift_url = {{ default.openshift_url }}