opendev
/
system-config
Code Issues Proposed changes

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
This commit is contained in:
Fabien Boucher 2015-05-15 07:55:17 +00:00
parent 03560b7696
commit e398ff3def
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openstack_project/manifests/zuul_dev.pp
View File

@ -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':

4
modules/openstack_project/manifests/zuul_merger.pp
View File

@ -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':

1
modules/openstack_project/manifests/zuul_prod.pp
View File

@ -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,
}