Ryan Lane has submitted this change and it was merged.

Change subject: role::applicationserver::appserver::beta
......................................................................


role::applicationserver::appserver::beta

The beta cluster has applicationserver instances which fulfill both the
appserver role AND the imagescaling role.  When applying both production
class we end up with a duplicate definition of the common class:

  Duplicate definition: Class[Role::Applicationserver::Common] is
  already defined in:
  file /etc/puppet/manifests/role/applicationserver.pp at line 106;
  cannot redefine at:
  /etc/puppet/manifests/role/applicationserver.pp:121

Using a new dedicated class let us mix both roles safely and also get
rid of some """if $::realm == 'labs'""" hacks.

Change-Id: I99da6dc727cd966f03061b6e3a772a26dd50434c
---
M manifests/role/applicationserver.pp
1 file changed, 18 insertions(+), 8 deletions(-)

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99da6dc727cd966f03061b6e3a772a26dd50434c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to