From 1bb27419cbbaea75a5ea419b64642808213ed5f2 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 19 Dec 2016 02:44:12 +0000 Subject: [PATCH] Fix secondary bridge Signed-off-by: Patrick Uiterwijk --- roles/sigul/bridge/files/koji-arm.conf | 4 ++-- roles/sigul/bridge/files/koji-ppc.conf | 5 ++--- roles/sigul/bridge/files/koji-primary.stg.conf | 5 ++--- roles/sigul/bridge/files/koji-s390.conf | 5 ++--- roles/sigul/bridge/templates/bridge.conf.j2 | 3 +-- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/roles/sigul/bridge/files/koji-arm.conf b/roles/sigul/bridge/files/koji-arm.conf index e802fd9eb3..e57b3fc6b9 100644 --- a/roles/sigul/bridge/files/koji-arm.conf +++ b/roles/sigul/bridge/files/koji-arm.conf @@ -16,5 +16,5 @@ topurl = https://armpkgs.fedoraproject.org/ serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem authtype = kerberos -principal = sigul/sign-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG -keytab = /etc/krb5.sigul_sign-bridge01.phx2.fedoraproject.org.keytab +principal = sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG +keytab = /etc/krb5.sigul_secondary-bridge01.phx2.fedoraproject.org.keytab diff --git a/roles/sigul/bridge/files/koji-ppc.conf b/roles/sigul/bridge/files/koji-ppc.conf index efc3c5f138..cedfaa67e7 100644 --- a/roles/sigul/bridge/files/koji-ppc.conf +++ b/roles/sigul/bridge/files/koji-ppc.conf @@ -16,6 +16,5 @@ topurl = https://ppc.koji.fedoraproject.org/ serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem authtype = kerberos -principal = sigul/sign-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG -keytab = /etc/krb5.sigul_sign-bridge01.phx2.fedoraproject.org.keytab - +principal = sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG +keytab = /etc/krb5.sigul_secondary-bridge01.phx2.fedoraproject.org.keytab diff --git a/roles/sigul/bridge/files/koji-primary.stg.conf b/roles/sigul/bridge/files/koji-primary.stg.conf index 03813440f7..cf121171b0 100644 --- a/roles/sigul/bridge/files/koji-primary.stg.conf +++ b/roles/sigul/bridge/files/koji-primary.stg.conf @@ -13,6 +13,5 @@ topurl = https://kojipkgs.stg.fedoraproject.org/ serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem authtype = kerberos -principal = sigul/sign-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG -keytab = /etc/krb5.sigul_sign-bridge01.phx2.fedoraproject.org.keytab - +principal = sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG +keytab = /etc/krb5.sigul_secondary-bridge01.phx2.fedoraproject.org.keytab diff --git a/roles/sigul/bridge/files/koji-s390.conf b/roles/sigul/bridge/files/koji-s390.conf index 4cba405d75..64a95a7e7a 100644 --- a/roles/sigul/bridge/files/koji-s390.conf +++ b/roles/sigul/bridge/files/koji-s390.conf @@ -16,6 +16,5 @@ topurl = https://s390pkgs.fedoraproject.org/ serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem authtype = kerberos -principal = sigul/sign-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG -keytab = /etc/krb5.sigul_sign-bridge01.phx2.fedoraproject.org.keytab - +principal = sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG +keytab = /etc/krb5.sigul_secondary-bridge01.phx2.fedoraproject.org.keytab diff --git a/roles/sigul/bridge/templates/bridge.conf.j2 b/roles/sigul/bridge/templates/bridge.conf.j2 index bf6454b7da..b05f900637 100644 --- a/roles/sigul/bridge/templates/bridge.conf.j2 +++ b/roles/sigul/bridge/templates/bridge.conf.j2 @@ -30,11 +30,10 @@ koji-instances: primary koji-config-primary: /etc/koji-primary.conf koji-config: /etc/koji-primary.conf {% else %} -koji-instances: ppc s390 arm sparc +koji-instances: ppc s390 arm koji-config-ppc: /etc/koji-ppc.conf koji-config-s390: /etc/koji-s390.conf koji-config-arm: /etc/koji-arm.conf -koji-config-sparc: /etc/koji-sparc.conf {% endif %} [daemon]