From 0cea3f39a48281d4aa2d71970a44025a692a0786 Mon Sep 17 00:00:00 2001 From: Mike Bonnet Date: Jan 06 2020 15:49:06 +0000 Subject: fix the getKrb5Vars() method to use the renamed variables Since pipeline-as-a-service!13 the KRB5_KDC_HOST, KRB5_ADMIN_HOST, and KRB5_KPASSWD_HOST variables have been removed, and replaced with a single KRB5_HOST variable. References to the different services are constructed by appending the service-specific _PORT variable to the KRB5_HOST variable, separated by a colon. --- diff --git a/vars/controller.groovy b/vars/controller.groovy index 7fdc51b..9307fef 100644 --- a/vars/controller.groovy +++ b/vars/controller.groovy @@ -48,9 +48,9 @@ def getKrb5Vars(String principal) { password: password, realm: vars.KRB5_REALM, domain: vars.KRB5_DOMAIN, - kdc_host: "${vars.KRB5_KDC_HOST}:${vars.KRB5_KDC_PORT}", - admin_host: "${vars.KRB5_ADMIN_HOST}:${vars.KRB5_ADMIN_PORT}", - kpasswd_host: "${vars.KRB5_KPASSWD_HOST}:${vars.KRB5_KPASSWD_PORT}" + kdc_host: "${vars.KRB5_HOST}:${vars.KRB5_KDC_PORT}", + admin_host: "${vars.KRB5_HOST}:${vars.KRB5_ADMIN_PORT}", + kpasswd_host: "${vars.KRB5_HOST}:${vars.KRB5_KPASSWD_PORT}" ] return krb_vars }