Herron has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394301 )
Change subject: puppet: fix cqlsh.erb template to parse under puppet 4 ...................................................................... puppet: fix cqlsh.erb template to parse under puppet 4 Update cqlshrc.erb to use @variable to address undefined local variable or method 'config_directory' error occurring under a puppet 4 master. Bug: T177254 Change-Id: I62693ac0366bfa9fe10146ee503bb091d0eafb4a --- M modules/cassandra/templates/cqlshrc.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Herron: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/cassandra/templates/cqlshrc.erb b/modules/cassandra/templates/cqlshrc.erb index ece31b3..31eca59 100644 --- a/modules/cassandra/templates/cqlshrc.erb +++ b/modules/cassandra/templates/cqlshrc.erb @@ -7,5 +7,5 @@ factory = cqlshlib.ssl.ssl_transport_factory [ssl] -certfile = <%= config_directory %>/tls/rootCa.crt +certfile = <%= @config_directory %>/tls/rootCa.crt <% end -%> -- To view, visit https://gerrit.wikimedia.org/r/394301 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62693ac0366bfa9fe10146ee503bb091d0eafb4a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Herron <[email protected]> Gerrit-Reviewer: Herron <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
