summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2018-04-26 21:48:00 +0200
committerColleen Murphy <colleen@gazlene.net>2018-04-26 23:05:46 +0200
commitefba033351d6a8274e7eec6a064e68d3150a78c4 (patch)
tree38709fc70241b49fd1c4dcd73273229d299a5575
parent65192133b7765b974d5d13e3580da32c8b97c970 (diff)
Use instance variables in puppet template
Using local ruby variables in puppet ERB templates was deprecated in puppet 3 and doesn't work any more in puppet 4. Access these values as ruby instance variables instead. Change-Id: I06bdd6f5b1f13c4970c5e3e9dc8be4cf8d919b03
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Joshua Hesketh <josh@nitrotech.org> Workflow+1: Joshua Hesketh <josh@nitrotech.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 01 May 2018 12:33:27 +0000 Reviewed-on: https://review.openstack.org/564609 Project: openstack-infra/puppet-kibana Branch: refs/heads/master
-rw-r--r--templates/dual-elasticsearch.vhost.erb8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/dual-elasticsearch.vhost.erb b/templates/dual-elasticsearch.vhost.erb
index 3f6ef0a..951d5c6 100644
--- a/templates/dual-elasticsearch.vhost.erb
+++ b/templates/dual-elasticsearch.vhost.erb
@@ -2,9 +2,9 @@
2 ServerName <%= @vhost_name %> 2 ServerName <%= @vhost_name %>
3 ServerAdmin <%= @serveradmin %> 3 ServerAdmin <%= @serveradmin %>
4<% if @serveraliases.is_a? Array %> 4<% if @serveraliases.is_a? Array %>
5<% serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %> 5<% @serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %>
6<% elsif @serveraliases != '' %> 6<% elsif @serveraliases != '' %>
7<%= " ServerAlias #{serveraliases}" %> 7<%= " ServerAlias #{@serveraliases}" %>
8<% end %> 8<% end %>
9 9
10 ErrorLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-error.log 10 ErrorLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-error.log
@@ -32,8 +32,8 @@
32 ProxyPassReverse <%= @elasticsearch_prefix %> <%= @elasticsearch_url %>/ 32 ProxyPassReverse <%= @elasticsearch_prefix %> <%= @elasticsearch_url %>/
33 </IfModule> 33 </IfModule>
34 34
35 DocumentRoot <%= docroot %> 35 DocumentRoot <%= @docroot %>
36 <Directory <%= docroot %>> 36 <Directory <%= @docroot %>>
37 Options -Multiviews 37 Options -Multiviews
38 <IfVersion >= 2.4> 38 <IfVersion >= 2.4>
39 Require all granted 39 Require all granted