summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2016-05-26 10:40:37 -0700
committerClark Boylan <clark.boylan@gmail.com>2016-05-26 11:06:06 -0700
commit7904825abb578c5c9f47859a272e5fa9df90ad36 (patch)
tree20273659021c7dafb982e496d8bc7fb3502fc690
parent586bb3818b42ce36dbec0d5fc6d7292b24ba15e9 (diff)
Configure apache when we use it
The kibana apache vhost file makes use of mod rewrite and mod proxy but we don't enable those modules explicitly here. We happen to enable them in other places that use this puppet module but that leads to races and isn't explicit enough. Go ahead and explicitly enable the deps in this puppet module so that it is self sufficient. Change-Id: Ic05f26d61f2ac4b5adffee98782d1a02931d5731
Notes
Notes (review): Code-Review+1: Anita Kuno <anteaya@anteaya.info> Code-Review+2: Paul Belanger <pabelanger@redhat.com> Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 26 May 2016 20:33:51 +0000 Reviewed-on: https://review.openstack.org/321777 Project: openstack-infra/puppet-kibana Branch: refs/heads/master
-rw-r--r--manifests/js.pp23
1 files changed, 22 insertions, 1 deletions
diff --git a/manifests/js.pp b/manifests/js.pp
index 3ff5f4b..da7efb2 100644
--- a/manifests/js.pp
+++ b/manifests/js.pp
@@ -59,12 +59,33 @@ class kibana::js (
59 subscribe => Vcsrepo[$base_path], 59 subscribe => Vcsrepo[$base_path],
60 } 60 }
61 61
62 include ::httpd
63 if !defined(Httpd_mod['rewrite']) {
64 httpd_mod { 'rewrite':
65 ensure => present,
66 }
67 }
68 if !defined(Httpd_mod['proxy']) {
69 httpd_mod { 'proxy':
70 ensure => present,
71 }
72 }
73 if !defined(Httpd_mod['proxy_http']) {
74 httpd_mod { 'proxy_http':
75 ensure => present,
76 }
77 }
78
62 httpd::vhost { 'kibana': 79 httpd::vhost { 'kibana':
63 docroot => "${base_path}/src", 80 docroot => "${base_path}/src",
64 vhost_name => $vhost_name, 81 vhost_name => $vhost_name,
65 serveraliases => $vhost_aliases, 82 serveraliases => $vhost_aliases,
66 port => 80, 83 port => 80,
67 template => $vhost_template, 84 template => $vhost_template,
85 require => [
86 Httpd_mod['rewrite'],
87 Httpd_mod['proxy'],
88 Httpd_mod['proxy_http'],
89 ],
68 } 90 }
69
70} 91}