From e398ff3def1e7083d2e6e6ce8a4ed85d852f8436 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fabien.boucher@enovance.com>
Date: Fri, 15 May 2015 07:55:17 +0000
Subject: [PATCH] Do not set the manage_log_conf feature flag as default is
 true

This patch takes part of the smooth shift of log
configuration files from system-config to puppet-zuul.

Here we remove the usage of manage_log_conf to true as
the patch this one depends on set the feature flag
as true by default. This removes useless redundancy.

This patch should be marged after Iae1e8329373463b332bf1452ec05187d8fda20e3
has been validated and merged.

Change-Id: I6693244d54d44b3f1044ff6a9016184e5b8af4ec
Depends-on: Iae1e8329373463b332bf1452ec05187d8fda20e3
---
 modules/openstack_project/manifests/zuul_dev.pp    | 5 +----
 modules/openstack_project/manifests/zuul_merger.pp | 4 +---
 modules/openstack_project/manifests/zuul_prod.pp   | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/openstack_project/manifests/zuul_dev.pp b/modules/openstack_project/manifests/zuul_dev.pp
index 96c2f807e5..8f93cc0e8f 100644
--- a/modules/openstack_project/manifests/zuul_dev.pp
+++ b/modules/openstack_project/manifests/zuul_dev.pp
@@ -52,13 +52,10 @@ class openstack_project::zuul_dev(
 
   class { '::zuul::server':
     layout_dir      => $::project_config::zuul_layout_dir,
-    manage_log_conf => true,
     require         => $::project_config::config_dir,
   }
 
-  class { '::zuul::merger':
-    manage_log_conf => true,
-  }
+  class { '::zuul::merger': }
 
   if $gerrit_ssh_host_key != '' {
     file { '/home/zuul/.ssh':
diff --git a/modules/openstack_project/manifests/zuul_merger.pp b/modules/openstack_project/manifests/zuul_merger.pp
index 3d3567400a..5b595e3855 100644
--- a/modules/openstack_project/manifests/zuul_merger.pp
+++ b/modules/openstack_project/manifests/zuul_merger.pp
@@ -27,9 +27,7 @@ class openstack_project::zuul_merger(
     git_name             => 'OpenStack Jenkins',
   }
 
-  class { '::zuul::merger':
-    manage_log_conf => true,
-  }
+  class { '::zuul::merger': }
 
   if $gerrit_ssh_host_key != '' {
     file { '/home/zuul/.ssh':
diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp
index abc04979cd..e67134ead8 100644
--- a/modules/openstack_project/manifests/zuul_prod.pp
+++ b/modules/openstack_project/manifests/zuul_prod.pp
@@ -70,7 +70,6 @@ class openstack_project::zuul_prod(
 
   class { '::zuul::server':
     layout_dir      => $::project_config::zuul_layout_dir,
-    manage_log_conf => true,
     require         => $::project_config::config_dir,
   }