Gage has submitted this change and it was merged. Change subject: puppet_certname: qualify var ......................................................................
puppet_certname: qualify var bug: T97251 Change-Id: I1e096d5b4bb410573bbc5da74f1be8c20e931014 --- M modules/strongswan/templates/ipsec.conf.erb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Gage: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/strongswan/templates/ipsec.conf.erb b/modules/strongswan/templates/ipsec.conf.erb index 0318311..cc66a7d 100644 --- a/modules/strongswan/templates/ipsec.conf.erb +++ b/modules/strongswan/templates/ipsec.conf.erb @@ -9,7 +9,7 @@ if left_ipv4 != "" and right_ipv4 != "" result << "conn #{@fqdn}-#{node}_by_ipv4" result << "\tleft=#{left_ipv4} " - result << "\tleftcert=#{puppet_certname}.pem" + result << "\tleftcert=#{@puppet_certname}.pem" result << "\tright=#{right_ipv4}" result << "\trightid=\"CN=#{node}\"" result << "" @@ -17,7 +17,7 @@ if left_ipv6 != "" and right_ipv6 != "" result << "conn #{@fqdn}-#{node}_by_ipv6" result << "\tleft=#{left_ipv6} " - result << "\tleftcert=#{puppet_certname}.pem" + result << "\tleftcert=#{@puppet_certname}.pem" result << "\tright=#{right_ipv6}" result << "\trightid=\"CN=#{node}\"" result << "" -- To view, visit https://gerrit.wikimedia.org/r/215772 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e096d5b4bb410573bbc5da74f1be8c20e931014 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya <mata...@foss.co.il> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Gage <jger...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits