Use force when purging
* modules/asterisk/manifests/init.pp * modules/jenkins/manifests/master.pp * modules/jenkins/manifests/slave.pp * modules/openstack_project/manifests/gerrit.pp * modules/openstack_project/manifests/jenkins.pp * modules/openstack_project/manifests/nodepool.pp * modules/openstack_project/manifests/static.pp: When a directory is puppet-managed for content using recurse, replace and purge you also need force or empty subdirectories will fail to be removed. What's worse, subscribing to that directory will cause a refresh to be triggered for it on every agent run. Change-Id: I232d6ba98475522f391f469c194a4450c7a0b2e1
This commit is contained in:
parent
ace2cf4b19
commit
33a62b6f61
@ -91,6 +91,7 @@ class asterisk (
|
||||
ensure => present,
|
||||
recurse => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
owner => 'asterisk',
|
||||
group => 'asterisk',
|
||||
mode => '0660',
|
||||
|
@ -217,6 +217,7 @@ class jenkins::master(
|
||||
mode => '0755',
|
||||
recurse => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
require => File['/usr/local/jenkins'],
|
||||
source => 'puppet:///modules/jenkins/slave_scripts',
|
||||
}
|
||||
|
@ -295,6 +295,7 @@ class jenkins::slave(
|
||||
mode => '0755',
|
||||
recurse => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
require => File['/usr/local/jenkins'],
|
||||
source => 'puppet:///modules/jenkins/slave_scripts',
|
||||
}
|
||||
|
@ -326,6 +326,7 @@ class openstack_project::gerrit (
|
||||
recurse => true,
|
||||
replace => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
source => 'puppet:///modules/openstack_project/gerrit/acls',
|
||||
require => Class['::gerrit']
|
||||
}
|
||||
|
@ -152,6 +152,7 @@ class openstack_project::jenkins (
|
||||
mode => '0755',
|
||||
recurse => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
source =>
|
||||
'puppet:///modules/openstack_project/jenkins_job_builder/config',
|
||||
notify => Exec['jenkins_jobs_update'],
|
||||
|
@ -49,6 +49,7 @@ class openstack_project::nodepool(
|
||||
mode => '0755',
|
||||
recurse => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
require => File['/etc/nodepool'],
|
||||
source => 'puppet:///modules/openstack_project/nodepool/scripts',
|
||||
}
|
||||
|
@ -135,6 +135,7 @@ class openstack_project::static (
|
||||
ensure => directory,
|
||||
recurse => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
|
Loading…
Reference in New Issue
Block a user