Merge "Use force when purging"

modules/asterisk/manifests/init.pp

@@ -91,6 +91,7 @@ class asterisk (
     ensure  => present,
     recurse => true,
     purge   => true,
+    force   => true,
     owner   => 'asterisk',
     group   => 'asterisk',
     mode    => '0660',

modules/jenkins/manifests/master.pp

@@ -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',
   }

modules/jenkins/manifests/slave.pp

@@ -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',
   }

modules/openstack_project/manifests/gerrit.pp

@@ -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']
     }

modules/openstack_project/manifests/jenkins.pp

@@ -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'],

modules/openstack_project/manifests/nodepool.pp

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

modules/openstack_project/manifests/static.pp

@@ -135,6 +135,7 @@ class openstack_project::static (
     ensure  => directory,
     recurse => true,
     purge   => true,
+    force   => true,
     owner   => 'root',
     group   => 'root',
     mode    => '0755',