From 2d5aa3bf6f86595421c57b5869df404560a553e3 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 31 Oct 2017 11:35:41 -0400 Subject: [PATCH] Fix dependency order with logstash_worker.pp Attempt to fix the following error: puppet-user[13761]: (/Stage[main]/Openstack_project::Logstash_worker/Log_processor::Worker[D]/File[/etc/logprocessor/jenkins-log-worker-D.yaml]) Could not evaluate: Could not retrieve information from environment production source(s) file:/etc/logprocessor/worker.yaml Change-Id: I7c8eef36cad7b62f3f70ef7069ec7e14a1ea8bd2 Signed-off-by: Paul Belanger --- .../openstack_project/manifests/logstash_worker.pp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/manifests/logstash_worker.pp b/modules/openstack_project/manifests/logstash_worker.pp index f5c721aa94..24a73c20bd 100644 --- a/modules/openstack_project/manifests/logstash_worker.pp +++ b/modules/openstack_project/manifests/logstash_worker.pp @@ -28,11 +28,12 @@ class openstack_project::logstash_worker ( ) { file { '/etc/logprocessor/worker.yaml': - ensure => present, - owner => 'root', - group => 'root', - mode => '0644', + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', content => template('openstack_project/logstash/jenkins-log-worker.yaml.erb'), + require => Class['::log_processor'], } file { '/etc/default/logstash-indexer': @@ -82,14 +83,18 @@ class openstack_project::logstash_worker ( include ::log_processor log_processor::worker { 'A': config_file => '/etc/logprocessor/worker.yaml', + require => File['/etc/logprocessor/worker.yaml'], } log_processor::worker { 'B': config_file => '/etc/logprocessor/worker.yaml', + require => File['/etc/logprocessor/worker.yaml'], } log_processor::worker { 'C': config_file => '/etc/logprocessor/worker.yaml', + require => File['/etc/logprocessor/worker.yaml'], } log_processor::worker { 'D': config_file => '/etc/logprocessor/worker.yaml', + require => File['/etc/logprocessor/worker.yaml'], } }