[MediaWiki-commits] [Gerrit] bugzilla-static: ensure_resource to fix duplicates - change (operations/puppet)

2016-01-26 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: bugzilla-static: ensure_resource to fix duplicates
..


bugzilla-static: ensure_resource to fix duplicates

Use ensure_resource instead of regular file definition
to avoid duplicate declaration puppet errors when combining
multiple roles on one host that all want to ensure /srv/org/wikimedia.

Change-Id: Ib2683860d422ae0991618b979574892adc24607e
---
M modules/bugzilla_static/manifests/init.pp
1 file changed, 3 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/bugzilla_static/manifests/init.pp 
b/modules/bugzilla_static/manifests/init.pp
index 8a77038..efb45b7 100644
--- a/modules/bugzilla_static/manifests/init.pp
+++ b/modules/bugzilla_static/manifests/init.pp
@@ -2,12 +2,9 @@
 # T85140
 class bugzilla_static {
 
-file { [ '/srv/org', '/srv/org/wikimedia', 
'/srv/org/wikimedia/static-bugzilla' ]:
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-}
+ensure_resource('file', '/srv/org', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia/static-bugzilla', {'ensure' => 
'directory' })
 
 file { '/srv/org/wikimedia/static-bugzilla/index.html':
 ensure => present,

-- 
To view, visit https://gerrit.wikimedia.org/r/266546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2683860d422ae0991618b979574892adc24607e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: John F. Lewis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] bugzilla-static: ensure_resource to fix duplicates - change (operations/puppet)

2016-01-26 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266546

Change subject: bugzilla-static: ensure_resource to fix duplicates
..

bugzilla-static: ensure_resource to fix duplicates

Use ensure_resource instead of regular file definition
to avoid duplicate declaration puppet errors when combining
multiple roles on one host that all want to ensure /srv/org/wikimedia.

Change-Id: Ib2683860d422ae0991618b979574892adc24607e
---
M modules/bugzilla_static/manifests/init.pp
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/266546/1

diff --git a/modules/bugzilla_static/manifests/init.pp 
b/modules/bugzilla_static/manifests/init.pp
index 8a77038..efb45b7 100644
--- a/modules/bugzilla_static/manifests/init.pp
+++ b/modules/bugzilla_static/manifests/init.pp
@@ -2,12 +2,9 @@
 # T85140
 class bugzilla_static {
 
-file { [ '/srv/org', '/srv/org/wikimedia', 
'/srv/org/wikimedia/static-bugzilla' ]:
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-}
+ensure_resource('file', '/srv/org', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia/static-bugzilla', {'ensure' => 
'directory' })
 
 file { '/srv/org/wikimedia/static-bugzilla/index.html':
 ensure => present,

-- 
To view, visit https://gerrit.wikimedia.org/r/266546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2683860d422ae0991618b979574892adc24607e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits