From b90d5465245d5a1d3b80b715d68c0c88fb066700 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 14 Jul 2015 16:21:47 -0400
Subject: [PATCH] Migrate grafana.o.o to puppet-httpd

Change-Id: I0bcc68e049396560e9f51a2cb4ba941f8a8d2862
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 modules/openstack_project/manifests/grafana.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/manifests/grafana.pp b/modules/openstack_project/manifests/grafana.pp
index da4e6d4b44..01e5b66a95 100644
--- a/modules/openstack_project/manifests/grafana.pp
+++ b/modules/openstack_project/manifests/grafana.pp
@@ -17,7 +17,7 @@ class openstack_project::grafana (
   $secret_key = '',
   $vhost_name = $::fqdn,
 ) {
-  include apache
+  include ::httpd
 
   $grafana_cfg_defaults = {
     # NOTE(pabelanger): app_mode must be the first key!
@@ -72,20 +72,20 @@ class openstack_project::grafana (
     require => Mysql::Db[$mysql_name],
   }
 
-  apache::vhost { $vhost_name:
+  ::httpd::vhost { $vhost_name:
     docroot  => 'MEANINGLESS ARGUMENT',
     port     => 80,
     priority => '50',
     template => 'openstack_project/grafana.vhost.erb',
   }
 
-  a2mod { 'rewrite':
+  httpd_mod { 'rewrite':
     ensure => present,
   }
-  a2mod { 'proxy':
+  httpd_mod { 'proxy':
     ensure => present,
   }
-  a2mod { 'proxy_http':
+  httpd_mod { 'proxy_http':
     ensure => present,
   }
 }