Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353122 )
Change subject: puppetmaster::backend: move 'include standard' to role
......................................................................
puppetmaster::backend: move 'include standard' to role
Change-Id: I09d073bd10232a0fba51890cdfe2661c0ef95856
---
M manifests/site.pp
M modules/role/manifests/puppetmaster/backend.pp
2 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index d476393..252d4cb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2383,10 +2383,7 @@
node /^puppetmaster[12]002\.(codfw|eqiad)\.wmnet$/ {
role(puppetmaster::backend)
- include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': interface => 'eth0', }
}
@@ -2536,11 +2533,7 @@
node /^rhodium.eqiad.wmnet/ {
role(puppetmaster::backend)
- include ::standard
-
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': interface => 'eth0', }
}
diff --git a/modules/role/manifests/puppetmaster/backend.pp
b/modules/role/manifests/puppetmaster/backend.pp
index c19a1c8..56cb7bb 100644
--- a/modules/role/manifests/puppetmaster/backend.pp
+++ b/modules/role/manifests/puppetmaster/backend.pp
@@ -1,6 +1,7 @@
# vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
class role::puppetmaster::backend {
+ include ::standard
include ::base::firewall
system::role { 'puppetmaster':
--
To view, visit https://gerrit.wikimedia.org/r/353122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09d073bd10232a0fba51890cdfe2661c0ef95856
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
