opendev/puppet-nodepool
Code Issues Proposed changes

Make builder ssl vhost futureparser safe

Browse Source 
The builder ssl vhost template looks up vars as if they are local.
Problem is with futureparser and puppet4 these vars don't make it into
the global scope so they aren't valid here. Instead we do explicit
lookup of the values in the correct scope.

Change-Id: I92a6533d47075d8dac404999a6e3b5c4ccea84ed
This commit is contained in:
Clark Boylan 2019-01-04 16:51:21 -08:00
parent 1114e062f2
commit 71fe2002e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/nodepool-builder.ssl.vhost.erb
View File

@ -16,13 +16,13 @@
SSLEngine on
SSLCertificateFile <%= @ssl_cert_file %>
SSLCertificateKeyFile <%= @ssl_key_file %>
SSLCertificateFile <%= scope.lookupvar("nodepool::builder::ssl_cert_file") %>
SSLCertificateKeyFile <%= scope.lookupvar("nodepool::builder::ssl_key_file") %>
<%# The original default was '' -%>
<%# scope.lookupvar returns nil for an undefined variable in puppet 4 -%>
<%# scope.lookupvar returns :undef for an undefined variable in puppet 3 -%>
<% unless ['', nil, :undef].include?@ssl_chain_file %>
SSLCertificateChainFile <%= @ssl_chain_file %>
<% unless ['', nil, :undef].include? scope.lookupvar("nodepool::builder::ssl_chain_file") %>
SSLCertificateChainFile <%= scope.lookupvar("nodepool::builder::ssl_chain_file") %>
<% end %>
DocumentRoot <%= scope.lookupvar("nodepool::builder::build_log_document_root") %>