[MediaWiki-commits] [Gerrit] operations/puppet[production]: labnodepool: move standard/firewall includes to role

2017-12-04 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392769 )

Change subject: labnodepool: move standard/firewall includes to role
..


labnodepool: move standard/firewall includes to role

Change-Id: I8ac8c0e768be1512c8a6102a6a5cd14326fece51
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/nodepool.pp
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Hashar: 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 2df12b8..f24070f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1298,8 +1298,6 @@
 node 'labnodepool1001.eqiad.wmnet' {
 $nagios_contact_group = 'admins,contint'
 role(wmcs::openstack::main::nodepool)
-include ::standard
-include ::base::firewall
 }
 
 ## labsdb dbs
diff --git a/modules/role/manifests/wmcs/openstack/main/nodepool.pp 
b/modules/role/manifests/wmcs/openstack/main/nodepool.pp
index 7e77871..d367c7c 100644
--- a/modules/role/manifests/wmcs/openstack/main/nodepool.pp
+++ b/modules/role/manifests/wmcs/openstack/main/nodepool.pp
@@ -1,4 +1,6 @@
 class role::wmcs::openstack::main::nodepool {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::nodepool::service
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ac8c0e768be1512c8a6102a6a5cd14326fece51
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labnodepool: move standard/firewall includes to role

2017-11-21 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392769 )

Change subject: labnodepool: move standard/firewall includes to role
..

labnodepool: move standard/firewall includes to role

Change-Id: I8ac8c0e768be1512c8a6102a6a5cd14326fece51
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/nodepool.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/392769/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 1a8ebb3..e435846 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1304,8 +1304,6 @@
 node 'labnodepool1001.eqiad.wmnet' {
 $nagios_contact_group = 'admins,contint'
 role(wmcs::openstack::main::nodepool)
-include ::standard
-include ::base::firewall
 }
 
 ## labsdb dbs
diff --git a/modules/role/manifests/wmcs/openstack/main/nodepool.pp 
b/modules/role/manifests/wmcs/openstack/main/nodepool.pp
index 7e77871..d367c7c 100644
--- a/modules/role/manifests/wmcs/openstack/main/nodepool.pp
+++ b/modules/role/manifests/wmcs/openstack/main/nodepool.pp
@@ -1,4 +1,6 @@
 class role::wmcs::openstack::main::nodepool {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::nodepool::service
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ac8c0e768be1512c8a6102a6a5cd14326fece51
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