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

Make kojira use krb

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2016-12-12 14:53:10 +00:00
parent b9b09631ab
commit 417f6e72b1
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@
- fedmsg/base - fedmsg/base
- role: keytab/service - role: keytab/service
service: kojira service: kojira
host: "koji.fedoraproject.org" host: "koji{{env_suffix}}.fedoraproject.org"
- koji_hub - koji_hub
- { role: nfs/server, when: env == "staging" } - { role: nfs/server, when: env == "staging" }
- { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') } - { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') }

2
roles/koji_hub/tasks/main.yml
View file

@ -336,7 +336,7 @@
- kojira - kojira
- name: kojira config - name: kojira config
copy: src=kojira.conf dest=/etc/kojira/kojira.conf template: src=kojira.conf dest=/etc/kojira/kojira.conf
tags: tags:
- config - config
- koji_hub - koji_hub

4
roles/koji_hub/files/kojira.conf → roles/koji_hub/templates/kojira.conf.j2
View file

@ -5,9 +5,9 @@
; For Kerberos authentication ; For Kerberos authentication
; the principal to connect with ; the principal to connect with
principal=kojira/koji.fedoraproject.org@FEDORAPROJECT.ORG principal=kojira/koji{{env_suffix}}.fedoraproject.org@{{ipa_realm}}
; The location of the keytab for the principal above ; The location of the keytab for the principal above
keytab=/etc/krb5.kojira_koji.fedoraproject.org.keytab keytab=/etc/krb5.kojira_koji{{env_suffix}}.fedoraproject.org.keytab
; The URL for the koji hub server ; The URL for the koji hub server
server=https://koji.fedoraproject.org/kojihub server=https://koji.fedoraproject.org/kojihub