diff options
| author | Adam Miller <admiller@redhat.com> | 2017-08-10 22:06:22 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2017-08-10 22:06:27 +0000 |
| commit | 16f198fe0e94e83ce11907ddcf2ca1c05894831d (patch) | |
| tree | 57353f06ece7b1789d72764cbb5d77c4dd61ab99 | |
| parent | 870251fa1f001731c55465f4005591782366dc57 (diff) | |
| download | ansible-16f198fe0e94e83ce11907ddcf2ca1c05894831d.tar.gz ansible-16f198fe0e94e83ce11907ddcf2ca1c05894831d.tar.xz ansible-16f198fe0e94e83ce11907ddcf2ca1c05894831d.zip | |
add namespace and enable orchestrator in osbs-client
Signed-off-by: Adam Miller <admiller@redhat.com>
| -rw-r--r-- | playbooks/groups/buildvm.yml | 4 | ||||
| -rw-r--r-- | playbooks/groups/osbs-orchestrator-cluster.yml | 4 | ||||
| -rw-r--r-- | roles/osbs-client/templates/osbs.conf.j2 | 18 |
3 files changed, 24 insertions, 2 deletions
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 889cf69fa..00a737004 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -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 } } - { diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml index 2c8748403..17b1acf98 100644 --- a/playbooks/groups/osbs-orchestrator-cluster.yml +++ b/playbooks/groups/osbs-orchestrator-cluster.yml @@ -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" } diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2 index ba245a98c..1ca745ad9 100644 --- a/roles/osbs-client/templates/osbs.conf.j2 +++ b/roles/osbs-client/templates/osbs.conf.j2 @@ -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 }} |