opendev/system-config
Code Issues Proposed changes

Migrate grafana.o.o to puppet-httpd

Browse Source 
Change-Id: I0bcc68e049396560e9f51a2cb4ba941f8a8d2862
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-07-14 16:21:47 -04:00
parent 8a342866f9
commit b90d546524
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

@ -17,7 +17,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!
@ -72,20 +72,20 @@ class openstack_project::grafana (
require => Mysql::Db[$mysql_name], require => Mysql::Db[$mysql_name],
} }
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,
} }
} }