From 417f6e72b1a652085fc399f10941ff0e1e92f653 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 12 Dec 2016 14:53:10 +0000 Subject: [PATCH] Make kojira use krb Signed-off-by: Patrick Uiterwijk --- playbooks/groups/koji-hub.yml | 2 +- roles/koji_hub/tasks/main.yml | 2 +- .../koji_hub/{files/kojira.conf => templates/kojira.conf.j2} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename roles/koji_hub/{files/kojira.conf => templates/kojira.conf.j2} (87%) diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 20d3ca409e..6f8ea6395a 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -32,7 +32,7 @@ - fedmsg/base - role: keytab/service service: kojira - host: "koji.fedoraproject.org" + host: "koji{{env_suffix}}.fedoraproject.org" - koji_hub - { role: nfs/server, when: env == "staging" } - { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') } diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index e0624b673a..f37dc515c3 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -336,7 +336,7 @@ - kojira - name: kojira config - copy: src=kojira.conf dest=/etc/kojira/kojira.conf + template: src=kojira.conf dest=/etc/kojira/kojira.conf tags: - config - koji_hub diff --git a/roles/koji_hub/files/kojira.conf b/roles/koji_hub/templates/kojira.conf.j2 similarity index 87% rename from roles/koji_hub/files/kojira.conf rename to roles/koji_hub/templates/kojira.conf.j2 index 8095fded01..0103672b56 100644 --- a/roles/koji_hub/files/kojira.conf +++ b/roles/koji_hub/templates/kojira.conf.j2 @@ -5,9 +5,9 @@ ; For Kerberos authentication ; 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 -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 server=https://koji.fedoraproject.org/kojihub