opendev/system-config
Code Issues Proposed changes

Merge "Manage hiera.yaml on all hosts"

Browse Source
This commit is contained in:
Jenkins 2015-10-28 03:49:17 +00:00 committed by Gerrit Code Review
commit 7ff013f6ae
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
modules/openstack_project/files/puppetmaster/hiera.yaml → modules/openstack_project/files/puppet/hiera.yaml
View File

10
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -69,16 +69,6 @@ class openstack_project::puppetmaster (
environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin', environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin',
} }
file { '/etc/puppet/hiera.yaml':
ensure => present,
owner => 'root',
group => 'root',
mode => '0555',
source => 'puppet:///modules/openstack_project/puppetmaster/hiera.yaml',
replace => true,
require => Class['openstack_project::server'],
}
file { '/var/lib/puppet/reports': file { '/var/lib/puppet/reports':
ensure => directory, ensure => directory,
owner => 'puppet', owner => 'puppet',

9
modules/openstack_project/manifests/template.pp
View File

@ -405,6 +405,15 @@ class openstack_project::template (
service { 'puppet': service { 'puppet':
ensure => stopped, ensure => stopped,
} }
file { '/etc/puppet/hiera.yaml':
ensure => present,
owner => 'root',
group => 'root',
mode => '0555',
source => 'puppet:///modules/openstack_project/puppet/hiera.yaml',
replace => true,
}
########################################################### ###########################################################
} }