Merge "Use force when purging"
This commit is contained in:
commit
afc4b77c9e
@ -91,6 +91,7 @@ class asterisk (
|
|||||||
ensure => present,
|
ensure => present,
|
||||||
recurse => true,
|
recurse => true,
|
||||||
purge => true,
|
purge => true,
|
||||||
|
force => true,
|
||||||
owner => 'asterisk',
|
owner => 'asterisk',
|
||||||
group => 'asterisk',
|
group => 'asterisk',
|
||||||
mode => '0660',
|
mode => '0660',
|
||||||
|
@ -217,6 +217,7 @@ class jenkins::master(
|
|||||||
mode => '0755',
|
mode => '0755',
|
||||||
recurse => true,
|
recurse => true,
|
||||||
purge => true,
|
purge => true,
|
||||||
|
force => true,
|
||||||
require => File['/usr/local/jenkins'],
|
require => File['/usr/local/jenkins'],
|
||||||
source => 'puppet:///modules/jenkins/slave_scripts',
|
source => 'puppet:///modules/jenkins/slave_scripts',
|
||||||
}
|
}
|
||||||
|
@ -295,6 +295,7 @@ class jenkins::slave(
|
|||||||
mode => '0755',
|
mode => '0755',
|
||||||
recurse => true,
|
recurse => true,
|
||||||
purge => true,
|
purge => true,
|
||||||
|
force => true,
|
||||||
require => File['/usr/local/jenkins'],
|
require => File['/usr/local/jenkins'],
|
||||||
source => 'puppet:///modules/jenkins/slave_scripts',
|
source => 'puppet:///modules/jenkins/slave_scripts',
|
||||||
}
|
}
|
||||||
|
@ -326,6 +326,7 @@ class openstack_project::gerrit (
|
|||||||
recurse => true,
|
recurse => true,
|
||||||
replace => true,
|
replace => true,
|
||||||
purge => true,
|
purge => true,
|
||||||
|
force => true,
|
||||||
source => 'puppet:///modules/openstack_project/gerrit/acls',
|
source => 'puppet:///modules/openstack_project/gerrit/acls',
|
||||||
require => Class['::gerrit']
|
require => Class['::gerrit']
|
||||||
}
|
}
|
||||||
|
@ -152,6 +152,7 @@ class openstack_project::jenkins (
|
|||||||
mode => '0755',
|
mode => '0755',
|
||||||
recurse => true,
|
recurse => true,
|
||||||
purge => true,
|
purge => true,
|
||||||
|
force => true,
|
||||||
source =>
|
source =>
|
||||||
'puppet:///modules/openstack_project/jenkins_job_builder/config',
|
'puppet:///modules/openstack_project/jenkins_job_builder/config',
|
||||||
notify => Exec['jenkins_jobs_update'],
|
notify => Exec['jenkins_jobs_update'],
|
||||||
|
@ -50,6 +50,7 @@ class openstack_project::nodepool(
|
|||||||
mode => '0755',
|
mode => '0755',
|
||||||
recurse => true,
|
recurse => true,
|
||||||
purge => true,
|
purge => true,
|
||||||
|
force => true,
|
||||||
require => File['/etc/nodepool'],
|
require => File['/etc/nodepool'],
|
||||||
source => 'puppet:///modules/openstack_project/nodepool/scripts',
|
source => 'puppet:///modules/openstack_project/nodepool/scripts',
|
||||||
}
|
}
|
||||||
|
@ -135,6 +135,7 @@ class openstack_project::static (
|
|||||||
ensure => directory,
|
ensure => directory,
|
||||||
recurse => true,
|
recurse => true,
|
||||||
purge => true,
|
purge => true,
|
||||||
|
force => true,
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
mode => '0755',
|
mode => '0755',
|
||||||
|
Loading…
Reference in New Issue
Block a user