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

refactor and fix up osbs-client role usage in osbs-master group playbook

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-07-13 21:44:19 +00:00
parent 5bdff52cb6
commit afa45e4d2f
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/osbs
View file

@ -14,3 +14,5 @@ docker_registry: "registry.fedoraproject.org"
osbs_url: "osbs.fedoraproject.org"
osbs_koji_username: "kojibuilder"
koji_url: "koji.fedoraproject.org"

2
inventory/group_vars/osbs-stg
View file

@ -14,3 +14,5 @@ docker_registry: "registry.stg.fedoraproject.org"
osbs_url: "osbs.stg.fedoraproject.org"
osbs_koji_username: "kojibuilder_stg"
koji_url: "koji.stg.fedoraproject.org"

24
playbooks/groups/osbs-master.yml
View file

@ -177,12 +177,12 @@
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://osbs.stg.fedoraproject.org/',
registry_uri: 'https://registry.stg.fedoraproject.org/v2',
source_registry_uri: 'https://registry.stg.fedoraproject.org/v2',
build_host: 'osbs.stg.fedoraproject.org',
koji_root: 'https://koji.stg.fedoraproject.org/koji',
koji_hub: 'https://koji.stg.fedoraproject.org/kojihub',
openshift_url: 'https://{{osbs_url}}/',
registry_uri: 'https://{{docker_registry}}/v2',
source_registry_uri: 'https://{{docker_registry}}/v2',
build_host: '{{osbs_url}}',
koji_root: 'https://{{koji_url}}/koji',
koji_hub: 'https://{{koji_url}}/kojihub',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',
@ -207,12 +207,12 @@
username: "{{ osbs_koji_prod_username }}",
password: "{{ osbs_koji_prod_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://osbs.fedoraproject.org:8443/',
registry_uri: 'https://osbs.fedoraproject.org/v2',
source_registry_uri: 'https://osbs.fedoraproject.org/v2',
build_host: 'osbs.fedoraproject.org',
koji_root: 'https://koji.fedoraproject.org/koji',
koji_hub: 'https://koji.fedoraproject.org/kojihub',
openshift_url: 'https://{{osbs_url}}/',
registry_uri: 'https://{{docker_registry}}/v2',
source_registry_uri: 'https://{{docker_registry}}/v2',
build_host: '{{osbs_url}}',
koji_root: 'https://{{koji_url}}/koji',
koji_hub: 'https://{{koji_url}}/kojihub',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',