Hashar has uploaded a new change for review.

Change subject: beta: /usr/local/apache dupe definition
......................................................................

beta: /usr/local/apache dupe definition

The role::appserver::beta class already creates /usr/local/apache by
including nfs::apache::labs. The reason is that on beta we want to
point to /data/project/apache. We end up with a duplication definition:

err: Could not retrieve catalog from remote server: Error 400 on SERVER:
Duplicate definition: File[/usr/local/apache] is already defined in file
/etc/puppet/manifests/nfs.pp at line 187; cannot redefine at
/etc/puppet/modules/applicationserver/manifests/config/apache.pp:29 on
node i-0000031a.pmtpa.wmflabs

This patch makes /usr/local/apache a directory if and only if
/usr/local/apache has not been defined previously.

Change-Id: Ia2b663f9d3cb1749fbc85b290ddee974871e8ec7
---
M modules/applicationserver/manifests/config/apache.pp
1 file changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/45115/1
--
To view, visit https://gerrit.wikimedia.org/r/45115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2b663f9d3cb1749fbc85b290ddee974871e8ec7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to