Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397865 )
Change subject: gerrit: add fallback default undef for IPv6 parameter ...................................................................... gerrit: add fallback default undef for IPv6 parameter IPv6 does not work in labs. It causes Apache to fail due to it not being able to bind to the port. The Apache ports.conf is already puppetized and set to skip the relevant "Listen" lines if @IPv6 isn't set but if we don't have a default value and the Hiera lookup fails we are getting a puppet error. Bug: T182705 Change-Id: Idb7c0772b583e247b73da4369639f6ca6373bbe3 --- M modules/profile/manifests/gerrit/server.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/profile/manifests/gerrit/server.pp b/modules/profile/manifests/gerrit/server.pp index b0175af..042b784 100644 --- a/modules/profile/manifests/gerrit/server.pp +++ b/modules/profile/manifests/gerrit/server.pp @@ -3,7 +3,7 @@ # filtertags: labs-project-git labs-project-ci-staging class profile::gerrit::server( $ipv4 = hiera('gerrit::service::ipv4'), - $ipv6 = hiera('gerrit::service::ipv6'), + $ipv6 = hiera('gerrit::service::ipv6', undef), $host = hiera('gerrit::server::host'), $slave_hosts = hiera('gerrit::server::slave_hosts'), $master_host = hiera('gerrit::server::master_host'), -- To view, visit https://gerrit.wikimedia.org/r/397865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb7c0772b583e247b73da4369639f6ca6373bbe3 Gerrit-PatchSet: 11 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits