WarlockFish/fedora-infra_ansible
1
0
Fork 0
mirror of https://pagure.io/fedora-infra/ansible.git synced 2026-03-20 03:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

add namespace and enable orchestrator in osbs-client

Browse Source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller
2017-08-10 22:06:22 +00:00
parent 870251fa1f
commit 16f198fe0e
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/groups/buildvm.yml
View File

@@ -99,7 +99,9 @@
builder_use_auth: true,
distribution_scope: 'private',
registry_api_versions: 'v2',
builder_openshift_url: 'https://{{osbs_url}}'
builder_openshift_url: 'https://{{osbs_url}}',
namespace: 'osbs',
can_orchestrate: true
}
}
- {

4
playbooks/groups/osbs-orchestrator-cluster.yml
View File

@@ -681,7 +681,9 @@
builder_use_auth: true,
distribution_scope: 'private',
registry_api_versions: 'v2',
builder_openshift_url: 'https://{{osbs_url}}'
builder_openshift_url: 'https://{{osbs_url}}',
namespace: 'osbs',
can_orchestrate: true
},
when: env == "staging"
}

18
roles/osbs-client/templates/osbs.conf.j2
View File

@@ -31,6 +31,15 @@ kerberos_keytab = {{ default.kerberos_keytab }}
{% if default.kerberos_principal is defined %}
kerberos_principal = {{ default.kerberos_principal }}
{% endif %}
# Orchestrator/Worker Architecture split additions
{% if default.can_orchestrate is defined %}
can_orchestrate = {{ default.can_orchestrate }}
{% endif %}
{% if default.namespace is defined %}
namespace = {{ default.namespace }}
{% endif %}
openshift_url = {{ default.openshift_url }}
koji_root = {{ default.koji_root }}
koji_hub = {{ default.koji_hub }}
@@ -77,6 +86,15 @@ kerberos_keytab = {{ default.kerberos_keytab }}
{% if default.kerberos_principal is defined %}
kerberos_principal = {{ default.kerberos_principal }}
{% endif %}
# Orchestrator/Worker Architecture split additions
{% if default.can_orchestrate is defined %}
can_orchestrate = {{ default.can_orchestrate }}
{% endif %}
{% if default.namespace is defined %}
namespace = {{ default.namespace }}
{% endif %}
openshift_url = {{ default.openshift_url }}
koji_root = {{ default.koji_root }}
koji_hub = {{ default.koji_hub }}