From 01c573b623fe119483dac56789c9401fe5ef94d8 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 31 Mar 2016 16:58:19 +0000 Subject: [PATCH] osbs: add openshift koji secret name to osbs.conf Signed-off-by: Adam Miller --- playbooks/groups/buildhw.yml | 1 + playbooks/groups/buildvm.yml | 1 + playbooks/groups/koji-hub.yml | 1 + roles/osbs-client/templates/osbs.conf.j2 | 3 +++ 4 files changed, 6 insertions(+) diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 283ed6b768..bea92d584c 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -41,6 +41,7 @@ default: { username: "{{ osbs_koji_stg_username }}", password: "{{ osbs_koji_stg_password }}", + koji_certs_secret: "koji", openshift_url: 'https://{{ osbs_fqdn }}:8443/', registry_uri: 'https://{{ docker_registry }}:5000/v2', source_registry_uri: 'https://{{ docker_registry }}:5000/v2', diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index a1b79443aa..c1bda784ba 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -48,6 +48,7 @@ default: { username: "{{ osbs_koji_stg_username }}", password: "{{ osbs_koji_stg_password }}", + koji_certs_secret: "koji", openshift_url: 'https://{{ osbs_fqdn }}:8443/', registry_uri: 'https://{{ docker_registry }}:5000/v2', source_registry_uri: 'https://{{ docker_registry }}:5000/v2', diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 1e63733286..21a5800701 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -43,6 +43,7 @@ default: { username: "{{ osbs_koji_stg_username }}", password: "{{ osbs_koji_stg_password }}", + koji_certs_secret: "koji", openshift_url: 'https://{{ osbs_fqdn }}:8443/', registry_uri: 'https://{{ docker_registry }}:5000/v2', source_registry_uri: 'https://{{ docker_registry }}:5000/v2', diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2 index b8df8ccb6b..2a2d35e1ca 100644 --- a/roles/osbs-client/templates/osbs.conf.j2 +++ b/roles/osbs-client/templates/osbs.conf.j2 @@ -10,6 +10,9 @@ username = {{ default.username }} {% if default.password %} password = {{ default.password }} {% endif %} +{% if default.koji_certs_secret %} +koji_certs_secret = {{ default.koji_certs_secret }} +{% endif %} openshift_url = {{ default.openshift_url }} koji_root = {{ default.koji_root }} koji_hub = {{ default.koji_hub }}