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

fix osbs krb5 keytab path, add new koji_kerb conf in osbs-client role

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-12-01 16:42:12 +00:00
parent 26a6813ce8
commit 7374fd7245
5 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
playbooks/groups/buildvm.yml
View file

@ -56,9 +56,9 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
use_kerberos: True,
kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}",
kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
koji_use_kerberos: True,
koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
openshift_url: 'https://{{ osbs_url }}/',
registry_uri: 'https://{{ docker_registry }}/v2',
source_registry_uri: 'https://{{ source_registry }}/v2',

6
playbooks/groups/koji-hub.yml
View file

@ -42,9 +42,9 @@
default: {
username: "{{ osbs_koji_prod_username }}",
password: "{{ osbs_koji_prod_password }}",
use_kerberos: True,
kerberos_keytab: "/etc/krb5.osbs_{{osbs_url}}",
kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
koji_use_kerberos: True,
koji_kerberos_keytab: "/etc/krb5.osbs_{{osbs_url}}.keytab",
koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
openshift_url: 'https://{{ osbs_url }}/',
registry_uri: 'https://{{ docker_registry }}/v2',
source_registry_uri: 'https://{{ source_registry }}/v2',

12
playbooks/groups/osbs-cluster.yml
View file

@ -466,9 +466,9 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
use_kerberos: True,
kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}",
kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
koji_use_kerberos: True,
koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
openshift_url: 'https://{{osbs_url}}/',
registry_uri: 'https://{{docker_registry}}/v2',
source_registry_uri: 'https://{{source_registry}}/v2',
@ -498,9 +498,9 @@
default: {
username: "{{ osbs_koji_prod_username }}",
password: "{{ osbs_koji_prod_password }}",
use_kerberos: True,
kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}",
kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
koji_use_kerberos: True,
koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
openshift_url: 'https://{{osbs_url}}/',
registry_uri: 'https://{{docker_registry}}/v2',
source_registry_uri: 'https://{{source_registry}}/v2',

3
roles/osbs-client/defaults/main.yml
View file

@ -33,6 +33,9 @@ default:
registry_api_versions: v2
builder_openshift_url: https://172.17.0.1:8443/
koji_certs_secret: false
koji_use_kerberos: false
koji_kerberos_keytab: ""
koji_kerberos_principal: ""
use_kerberos: false
kerberos_keytab: ""
kerberos_principal: ""

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

@ -13,6 +13,15 @@ password = {{ default.password }}
{% if default.koji_certs_secret is defined %}
koji_certs_secret = {{ default.koji_certs_secret }}
{% endif %}
{% if default.koji_use_kerberos is defined %}
koji_use_kerberos = {{ default.koji_use_kerberos }}
{% endif %}
{% if default.koji_kerberos_keytab is defined %}
koji_kerberos_keytab = {{ default.koji_kerberos_keytab }}
{% endif %}
{% if default.koji_kerberos_principal is defined %}
koji_kerberos_principal = {{ default.koji_kerberos_principal }}
{% endif %}
{% if default.use_kerberos is defined %}
use_kerberos = {{ default.use_kerberos }}
{% endif %}
@ -50,6 +59,15 @@ password = {{ default.password }}
{% if default.koji_certs_secret is defined %}
koji_certs_secret = {{ default.koji_certs_secret }}
{% endif %}
{% if default.koji_use_kerberos is defined %}
koji_use_kerberos = {{ default.koji_use_kerberos }}
{% endif %}
{% if default.koji_kerberos_keytab is defined %}
koji_kerberos_keytab = {{ default.koji_kerberos_keytab }}
{% endif %}
{% if default.koji_kerberos_principal is defined %}
koji_kerberos_principal = {{ default.koji_kerberos_principal }}
{% endif %}
{% if default.use_kerberos is defined %}
use_kerberos = {{ default.use_kerberos }}
{% endif %}