summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2018-12-14 12:46:41 -0800
committerClark Boylan <clark.boylan@gmail.com>2018-12-14 12:47:52 -0800
commitc6e070db6ca8eb0a1534dc8d27bafc63ec1b93d0 (patch)
tree15f8fb77ccd14a1113616ddb9e9a8b644e5df385
parentdb7e1887c8376279795e7ca1d03967b1c2a5a2cc (diff)
Set server admin var so that vhost works
Using the puppet 4 future parser it is far more particular about variables and their scoping. We don't set a serveradmin in this class but then attempt to use it in the vhost template. This was fine under puppet 3 as it would just look for this out of the current scope but breaks under puppet 4. Make this trivially happy on puppet 4 by setting a default that is sane. Change-Id: Id415056cdfa693fd199e0b4a0c6b09e20faf23ef
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 14 Dec 2018 22:02:05 +0000 Reviewed-on: https://review.openstack.org/625344 Project: openstack-infra/puppet-kibana Branch: refs/heads/master
-rw-r--r--manifests/js.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/js.pp b/manifests/js.pp
index 49b445c..60ed204 100644
--- a/manifests/js.pp
+++ b/manifests/js.pp
@@ -23,6 +23,7 @@ class kibana::js (
23 $vhost_proxy_connect_timeout = '15', 23 $vhost_proxy_connect_timeout = '15',
24 $vhost_proxy_timeout = '120', 24 $vhost_proxy_timeout = '120',
25 $vhost_template = 'kibana/dual-elasticsearch.vhost.erb', 25 $vhost_template = 'kibana/dual-elasticsearch.vhost.erb',
26 $serveradmin = "webmaster@${::fqdn}",
26) { 27) {
27 28
28 $base_path = "/opt/kibana/${git_revision}" 29 $base_path = "/opt/kibana/${git_revision}"