[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs::puppetmaster: move standard/firewall include to roles

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405990 )

Change subject: wmcs::puppetmaster: move standard/firewall include to roles
......................................................................


wmcs::puppetmaster: move standard/firewall include to roles

Change-Id: Ifc7479dcccab94cc4fb0fea5a4b1f9f1ed8806ba
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 0eda878..0c6c313 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -891,15 +891,11 @@
 
 node 'labpuppetmaster1001.wikimedia.org' {
     role(wmcs::openstack::main::puppetmaster::frontend)
-    include ::standard
-    include ::base::firewall
     interface::add_ip6_mapped { 'main': }
 }
 
 node 'labpuppetmaster1002.wikimedia.org' {
     role(wmcs::openstack::main::puppetmaster::backend)
-    include ::standard
-    include ::base::firewall
     interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp 
b/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
index abb28d6..04ad540 100644
--- a/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
+++ b/modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::puppetmaster::backend {
     system::role { $name: }
+    include ::standard
+    include ::profile::base::firewall
     include ::profile::openstack::main::clientlib
     include ::profile::openstack::main::observerenv
     include ::profile::openstack::main::puppetmaster::backend
diff --git 
a/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp 
b/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
index 88e3b14..6a879cb 100644
--- a/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
+++ b/modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::puppetmaster::frontend {
     system::role { $name: }
+    include ::standard
+    include ::profile::base::firewall
     include ::profile::openstack::main::clientlib
     include ::profile::openstack::main::observerenv
     include ::profile::openstack::main::puppetmaster::frontend

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc7479dcccab94cc4fb0fea5a4b1f9f1ed8806ba
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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