summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2018-12-14 15:40:03 -0800
committerClark Boylan <clark.boylan@gmail.com>2018-12-14 15:40:03 -0800
commit073ef439a7bde1ada1ddc34fc407dd28abddde94 (patch)
tree09e6b3685cd5ac9b2ce069f88a1131f62a9b6b47
parentc6e070db6ca8eb0a1534dc8d27bafc63ec1b93d0 (diff)
Use full lookup path for serveradmin in templateHEADmaster
The last change was incomplete bceause we evaluate the apache conf template in the context of the httpd class meaning any vars outside of that class must be fully qualified lookups. Make serveradmin a fully qualified lookup. Change-Id: I709af6a78316cd1ca7e489d62f13e988997f3157
Notes
Notes (review): Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 15 Dec 2018 01:22:30 +0000 Reviewed-on: https://review.openstack.org/625374 Project: openstack-infra/puppet-kibana Branch: refs/heads/master
-rw-r--r--templates/dual-elasticsearch.vhost.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/dual-elasticsearch.vhost.erb b/templates/dual-elasticsearch.vhost.erb
index 6f75740..27c7c3b 100644
--- a/templates/dual-elasticsearch.vhost.erb
+++ b/templates/dual-elasticsearch.vhost.erb
@@ -1,6 +1,6 @@
1<VirtualHost *:80> 1<VirtualHost *:80>
2 ServerName <%= @vhost_name %> 2 ServerName <%= @vhost_name %>
3 ServerAdmin <%= @serveradmin %> 3 ServerAdmin <%= scope.lookupvar('::kibana::js::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 ! ['', nil].include?(@serveraliases) %> 6<% elsif ! ['', nil].include?(@serveraliases) %>