opendev/system-config
Code Issues Proposed changes

Fix another cacti dependency issue with /var/lib/cacti

Browse Source 
Seem there is a race on xenial where we try to populate /var/lib/cacti
before it is created.

Change-Id: I179e2e2d9d4f9df53aace172950af66aed92efad
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-12-14 13:47:41 -05:00 committed by James E. Blair
parent a304c5a718
commit a376c9db5a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/openstack_project/manifests/cacti.pp
View File

@ -48,14 +48,20 @@ class openstack_project::cacti (
require => File['/usr/local/share/cacti/resource/snmp_queries'], require => File['/usr/local/share/cacti/resource/snmp_queries'],
} }
file { '/var/lib/cacti':
ensure => directory,
require => Package['cacti'],
}
file { '/var/lib/cacti/linux_host.xml': file { '/var/lib/cacti/linux_host.xml':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/cacti/linux_host.xml', source => 'puppet:///modules/openstack_project/cacti/linux_host.xml',
mode => '0644', mode => '0644',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
require => File[ require => [
'/usr/local/share/cacti/resource/snmp_queries/net-snmp_devio.xml' File['/usr/local/share/cacti/resource/snmp_queries/net-snmp_devio.xml'],
File['/var/lib/cacti'],
], ],
} }
@ -79,6 +85,7 @@ class openstack_project::cacti (
mode => '0744', mode => '0744',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
require => File['/var/lib/cacti'],
} }
cron { 'add cacti hosts': cron { 'add cacti hosts':