Merge "Allow logserver to run on CI server (part 1)"

manifests/logserver.pp

@@ -35,24 +35,21 @@ class openstackci::logserver (
   include ::httpd
   include ::httpd::mod::wsgi
 
-  if ! defined(Httpd_mod['rewrite']) {
-    httpd_mod { 'rewrite':
+  if ! defined(Httpd_mod['rewrite']) and ! defined(Httpd::Mod['rewrite']) {
+    httpd::mod { 'rewrite':
       ensure => present,
-      before => Service['httpd']
     }
   }
 
-  if ! defined(Httpd_mod['proxy']) {
-    httpd_mod { 'proxy':
+  if ! defined(Httpd_mod['proxy']) and ! defined(Httpd::Mod['proxy']) {
+    httpd::mod { 'proxy':
       ensure => present,
-      before => Service['httpd']
     }
   }
 
-  if ! defined(Httpd_mod['proxy_http']) {
-    httpd_mod { 'proxy_http':
+  if ! defined(Httpd_mod['proxy_http']) and ! defined(Httpd::Mod['proxy_http']) {
+    httpd::mod { 'proxy_http':
       ensure => present,
-      before => Service['httpd']
     }
   }
 
@@ -94,12 +91,16 @@ class openstackci::logserver (
     require => File['/srv/static/logs'],
   }
 
-  package { 'build-essential':
-    ensure => 'present',
+  if ! defined(Package['build-essential']) {
+    package { 'build-essential':
+      ensure => 'present',
+    }
   }
 
-  package { 'python-dev':
-    ensure => 'present',
+  if ! defined(Package['python-dev']) {
+    package { 'python-dev':
+      ensure => 'present',
+    }
   }
 
   package { 'keyring':