opendev/system-config
Code Issues Proposed changes

Merge "Migrate grafana.o.o to puppet-httpd"

Browse Source
This commit is contained in:
Jenkins 2015-08-05 21:12:23 +00:00 committed by Gerrit Code Review
commit 20e710e3b4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/manifests/grafana.pp
View File

@ -16,7 +16,7 @@ class openstack_project::grafana (
$secret_key = '', $secret_key = '',
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
) { ) {
include apache include ::httpd
$grafana_cfg_defaults = { $grafana_cfg_defaults = {
# NOTE(pabelanger): app_mode must be the first key! # NOTE(pabelanger): app_mode must be the first key!
@ -54,20 +54,20 @@ class openstack_project::grafana (
cfg => $grafana_cfg_merged, cfg => $grafana_cfg_merged,
} }
apache::vhost { $vhost_name: ::httpd::vhost { $vhost_name:
docroot => 'MEANINGLESS ARGUMENT', docroot => 'MEANINGLESS ARGUMENT',
port => 80, port => 80,
priority => '50', priority => '50',
template => 'openstack_project/grafana.vhost.erb', template => 'openstack_project/grafana.vhost.erb',
} }
a2mod { 'rewrite': httpd_mod { 'rewrite':
ensure => present, ensure => present,
} }
a2mod { 'proxy': httpd_mod { 'proxy':
ensure => present, ensure => present,
} }
a2mod { 'proxy_http': httpd_mod { 'proxy_http':
ensure => present, ensure => present,
} }
} }