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

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, 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}}',
namespace: 'osbs',
can_orchestrate: true
} }
} }
- { - {

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

@ -681,7 +681,9 @@
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}}',
namespace: 'osbs',
can_orchestrate: true
}, },
when: env == "staging" 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 %} {% if default.kerberos_principal is defined %}
kerberos_principal = {{ default.kerberos_principal }} kerberos_principal = {{ default.kerberos_principal }}
{% endif %} {% 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 }} openshift_url = {{ default.openshift_url }}
koji_root = {{ default.koji_root }} koji_root = {{ default.koji_root }}
koji_hub = {{ default.koji_hub }} koji_hub = {{ default.koji_hub }}
@ -77,6 +86,15 @@ kerberos_keytab = {{ default.kerberos_keytab }}
{% if default.kerberos_principal is defined %} {% if default.kerberos_principal is defined %}
kerberos_principal = {{ default.kerberos_principal }} kerberos_principal = {{ default.kerberos_principal }}
{% endif %} {% 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 }} openshift_url = {{ default.openshift_url }}
koji_root = {{ default.koji_root }} koji_root = {{ default.koji_root }}
koji_hub = {{ default.koji_hub }} koji_hub = {{ default.koji_hub }}