From 4d654d1891f1d2d38355ac210251d0ce225f91bd Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 19 Aug 2015 09:45:49 -0400
Subject: [PATCH] Remove logic to check for puppetlabs-apache

Now that puppet-httpd has been fully migrated too, we can remove this
obsolete logic.

Change-Id: Ic4e07a4031854bed0e53305d6cc1b376b8c60f21
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 manifests/logserver.pp | 104 ++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 74 deletions(-)

diff --git a/manifests/logserver.pp b/manifests/logserver.pp
index 055a238..907b48e 100644
--- a/manifests/logserver.pp
+++ b/manifests/logserver.pp
@@ -32,88 +32,44 @@ class openstackci::logserver (
     }
   }
 
-  # NOTE(pabelanger): Until we full remove puppetlabs-apache from
-  # system-config, we need to do this hack to avoid a circular dependency.
-  if ! defined(Class['::apache']) {
-    include ::httpd
-    include ::httpd::mod::wsgi
+  include ::httpd
+  include ::httpd::mod::wsgi
 
-    if ! defined(Httpd_mod['rewrite']) {
-      httpd_mod { 'rewrite':
-        ensure => present,
-        before => Service['httpd']
-      }
+  if ! defined(Httpd_mod['rewrite']) {
+    httpd_mod { 'rewrite':
+      ensure => present,
+      before => Service['httpd']
     }
+  }
 
-    if ! defined(Httpd_mod['proxy']) {
-      httpd_mod { 'proxy':
-        ensure => present,
-        before => Service['httpd']
-      }
+  if ! defined(Httpd_mod['proxy']) {
+    httpd_mod { 'proxy':
+      ensure => present,
+      before => Service['httpd']
     }
+  }
 
-    if ! defined(Httpd_mod['proxy_http']) {
-      httpd_mod { 'proxy_http':
-        ensure => present,
-        before => Service['httpd']
-      }
+  if ! defined(Httpd_mod['proxy_http']) {
+    httpd_mod { 'proxy_http':
+      ensure => present,
+      before => Service['httpd']
     }
+  }
 
-    ::httpd::vhost { "logs.${domain}":
-      port     => 80,
-      priority => '50',
-      docroot  => '/srv/static/logs',
-      require  => File['/srv/static/logs'],
-      template => 'openstackci/logs.vhost.erb',
-    }
+  ::httpd::vhost { "logs.${domain}":
+    port     => 80,
+    priority => '50',
+    docroot  => '/srv/static/logs',
+    require  => File['/srv/static/logs'],
+    template => 'openstackci/logs.vhost.erb',
+  }
 
-    ::httpd::vhost { "logs-dev.${domain}":
-      port     => 80,
-      priority => '51',
-      docroot  => '/srv/static/logs',
-      require  => File['/srv/static/logs'],
-      template => 'openstackci/logs-dev.vhost.erb',
-    }
-  } else {
-    include apache
-    include apache::mod::wsgi
-
-    if ! defined(A2mod['rewrite']) {
-      a2mod { 'rewrite':
-        ensure => present,
-        before => Service['httpd']
-      }
-    }
-
-    if ! defined(A2mod['proxy']) {
-      a2mod { 'proxy':
-        ensure => present,
-        before => Service['httpd']
-      }
-    }
-
-    if ! defined(A2mod['proxy_http']) {
-      a2mod { 'proxy_http':
-        ensure => present,
-        before => Service['httpd']
-      }
-    }
-
-    apache::vhost { "logs.${domain}":
-      port     => 80,
-      priority => '50',
-      docroot  => '/srv/static/logs',
-      require  => File['/srv/static/logs'],
-      template => 'openstackci/logs.vhost.erb',
-    }
-
-    apache::vhost { "logs-dev.${domain}":
-      port     => 80,
-      priority => '51',
-      docroot  => '/srv/static/logs',
-      require  => File['/srv/static/logs'],
-      template => 'openstackci/logs-dev.vhost.erb',
-    }
+  ::httpd::vhost { "logs-dev.${domain}":
+    port     => 80,
+    priority => '51',
+    docroot  => '/srv/static/logs',
+    require  => File['/srv/static/logs'],
+    template => 'openstackci/logs-dev.vhost.erb',
   }
 
   if ! defined(File['/srv/static']) {