From 753e337fcc4d7744599bd7db2a17e49f63510aa1 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 2 Dec 2013 13:30:41 -0800
Subject: [PATCH] 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
---
modules/jenkins/manifests/master.pp | 1 +
modules/jenkins/manifests/slave.pp | 1 +
modules/openstack_project/manifests/gerrit.pp | 1 +
modules/openstack_project/manifests/nodepool.pp | 1 +
modules/openstack_project/manifests/static.pp | 1 +
5 files changed, 5 insertions(+)
diff --git a/modules/jenkins/manifests/master.pp b/modules/jenkins/manifests/master.pp
index 9497b17610..1f0728ce8e 100644
--- a/modules/jenkins/manifests/master.pp
+++ b/modules/jenkins/manifests/master.pp
@@ -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',
}
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 44f55fd8a5..7e1e13a690 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -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',
}
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index b7189beb9c..04d4b02fe7 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -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']
}
diff --git a/modules/openstack_project/manifests/nodepool.pp b/modules/openstack_project/manifests/nodepool.pp
index aa140ce134..b287596c5d 100644
--- a/modules/openstack_project/manifests/nodepool.pp
+++ b/modules/openstack_project/manifests/nodepool.pp
@@ -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',
}
diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index c4d766b45a..522cbed644 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -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',