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

osbs: add openshift koji secret name to osbs.conf

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-03-31 16:58:19 +00:00
parent 4f1a797755
commit 01c573b623
4 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/groups/buildhw.yml
View file

@ -41,6 +41,7 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',

1
playbooks/groups/buildvm.yml
View file

@ -48,6 +48,7 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',

1
playbooks/groups/koji-hub.yml
View file

@ -43,6 +43,7 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',

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

@ -10,6 +10,9 @@ username = {{ default.username }}
{% if default.password %}
password = {{ default.password }}
{% endif %}
{% if default.koji_certs_secret %}
koji_certs_secret = {{ default.koji_certs_secret }}
{% endif %}
openshift_url = {{ default.openshift_url }}
koji_root = {{ default.koji_root }}
koji_hub = {{ default.koji_hub }}