re-enable osbs-client role for osbs-orchestrator-cluster
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
parent
ccde82df8c
commit
fc7785239a
1 changed files with 33 additions and 34 deletions
|
@ -661,40 +661,39 @@
|
||||||
- name: systemctl daemon-reload
|
- name: systemctl daemon-reload
|
||||||
shell: 'systemctl daemon-reload'
|
shell: 'systemctl daemon-reload'
|
||||||
|
|
||||||
# FIXME - Not sure if this is needed anymore because of the osbs-namespace role
|
roles:
|
||||||
# roles:
|
- {
|
||||||
# - {
|
role: osbs-client,
|
||||||
# role: osbs-client,
|
general: {
|
||||||
# general: {
|
verbose: 0,
|
||||||
# verbose: 0,
|
build_json_dir: '/etc/osbs/input/',
|
||||||
# build_json_dir: '/etc/osbs/input/',
|
openshift_required_version: 1.1.0,
|
||||||
# openshift_required_version: 1.1.0,
|
},
|
||||||
# },
|
default: {
|
||||||
# default: {
|
username: "{{ osbs_koji_stg_username }}",
|
||||||
# username: "{{ osbs_koji_stg_username }}",
|
password: "{{ osbs_koji_stg_password }}",
|
||||||
# password: "{{ osbs_koji_stg_password }}",
|
koji_use_kerberos: True,
|
||||||
# koji_use_kerberos: True,
|
koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
|
||||||
# koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
|
koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
|
||||||
# koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
|
openshift_url: 'https://{{osbs_url}}/',
|
||||||
# openshift_url: 'https://{{osbs_url}}/',
|
registry_uri: 'https://{{candidate_registry}}/v2',
|
||||||
# registry_uri: 'https://{{candidate_registry}}/v2',
|
source_registry_uri: 'https://{{stable_registry}}/v2',
|
||||||
# source_registry_uri: 'https://{{stable_registry}}/v2',
|
build_host: '{{osbs_url}}',
|
||||||
# build_host: '{{osbs_url}}',
|
koji_root: '{{koji_root}}',
|
||||||
# koji_root: '{{koji_root}}',
|
koji_hub: '{{koji_hub}}',
|
||||||
# koji_hub: '{{koji_hub}}',
|
sources_command: 'fedpkg sources',
|
||||||
# sources_command: 'fedpkg sources',
|
build_type: 'prod',
|
||||||
# build_type: 'prod',
|
authoritative_registry: '{{stable_registry}}',
|
||||||
# authoritative_registry: '{{stable_registry}}',
|
vendor: 'Fedora Project',
|
||||||
# vendor: 'Fedora Project',
|
verify_ssl: true,
|
||||||
# verify_ssl: true,
|
use_auth: true,
|
||||||
# use_auth: true,
|
builder_use_auth: true,
|
||||||
# builder_use_auth: true,
|
distribution_scope: 'private',
|
||||||
# distribution_scope: 'private',
|
registry_api_versions: 'v2',
|
||||||
# registry_api_versions: 'v2',
|
builder_openshift_url: 'https://{{osbs_url}}'
|
||||||
# builder_openshift_url: 'https://{{osbs_url}}'
|
},
|
||||||
# },
|
when: env == "staging"
|
||||||
# when: env == "staging"
|
}
|
||||||
# }
|
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- name: copy docker iptables script
|
- name: copy docker iptables script
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue