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