diff --git a/modules/asterisk/manifests/init.pp b/modules/asterisk/manifests/init.pp index 8125fc3828..dc7e406260 100644 --- a/modules/asterisk/manifests/init.pp +++ b/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', diff --git a/modules/jenkins/manifests/master.pp b/modules/jenkins/manifests/master.pp index 1f0728ce8e..9601ff5f04 100644 --- a/modules/jenkins/manifests/master.pp +++ b/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', } diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index a08d6ac2c7..ad1590c175 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/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', } diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index 04d4b02fe7..a193d07443 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/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'] } diff --git a/modules/openstack_project/manifests/jenkins.pp b/modules/openstack_project/manifests/jenkins.pp index c397933441..a2b6eea120 100644 --- a/modules/openstack_project/manifests/jenkins.pp +++ b/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'], diff --git a/modules/openstack_project/manifests/nodepool.pp b/modules/openstack_project/manifests/nodepool.pp index b287596c5d..2fc3850983 100644 --- a/modules/openstack_project/manifests/nodepool.pp +++ b/modules/openstack_project/manifests/nodepool.pp @@ -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', } diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index 522cbed644..800ff91b47 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/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',