Use purge option where appropriate.

* modules/jenkins/manifests/master.pp
* modules/jenkins/manifests/slave.pp: Recursively purge the
slave_scripts dir. This will remove old slave scripts.

* modules/openstack_project/manifests/gerrit.pp: Recursively purge the
gerrit ACLs dir. This will remove old and renamed ACL files.

* modules/openstack_project/manifests/nodepool.pp: Recursively purge the
nodepool scripts dir. This will remove old and renamed nodepool scripts.

* modules/openstack_project/manifests/static.pp: Recursively purge the
devstack log help files. This will remove old and renamed help files.

Change-Id: If739b274075781dcd0d0836bca96dd1764c6ee19
This commit is contained in:
Clark Boylan 2013-12-02 13:30:41 -08:00
parent cd84e2ed92
commit 753e337fcc
5 changed files with 5 additions and 0 deletions

View File

@ -216,6 +216,7 @@ class jenkins::master(
group => 'root',
mode => '0755',
recurse => true,
purge => true,
require => File['/usr/local/jenkins'],
source => 'puppet:///modules/jenkins/slave_scripts',
}

View File

@ -294,6 +294,7 @@ class jenkins::slave(
group => 'root',
mode => '0755',
recurse => true,
purge => true,
require => File['/usr/local/jenkins'],
source => 'puppet:///modules/jenkins/slave_scripts',
}

View File

@ -325,6 +325,7 @@ class openstack_project::gerrit (
mode => '0444',
recurse => true,
replace => true,
purge => true,
source => 'puppet:///modules/openstack_project/gerrit/acls',
require => Class['::gerrit']
}

View File

@ -48,6 +48,7 @@ class openstack_project::nodepool(
group => 'root',
mode => '0755',
recurse => true,
purge => true,
require => File['/etc/nodepool'],
source => 'puppet:///modules/openstack_project/nodepool/scripts',
}

View File

@ -134,6 +134,7 @@ class openstack_project::static (
file { '/srv/static/logs/help':
ensure => directory,
recurse => true,
purge => true,
owner => 'root',
group => 'root',
mode => '0755',