[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack::main: move standard/firewall includes to roles

2018-01-23 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/406003 )

Change subject: openstack::main: move standard/firewall includes to roles
..


openstack::main: move standard/firewall includes to roles

Change-Id: Ife0ca839c9e821c7fa8bfdbd4a92d67af2782d4d
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
M modules/role/manifests/wmcs/openstack/main/services_primary.pp
M modules/role/manifests/wmcs/openstack/main/services_secondary.pp
M modules/role/manifests/wmcs/openstack/main/wikitech.pp
5 files changed, 7 insertions(+), 11 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 0c6c313..2ca7f64 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -903,15 +903,11 @@
 # and the powerdns auth and recursive services for instances.
 node 'labservices1001.wikimedia.org' {
 role(wmcs::openstack::main::services_primary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
 node 'labservices1002.wikimedia.org' {
 role(wmcs::openstack::main::services_secondary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1078,8 +1074,6 @@
 
 node 'labcontrol1001.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1091,8 +1085,6 @@
 #  'keystone endpoint-create' and 'keystone endpoint-delete.'
 node 'labcontrol1002.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1925,9 +1917,6 @@
 node 'silver.wikimedia.org' {
 role(wmcs::openstack::main::wikitech)
 include ::role::mariadb::wikitech
-include ::base::firewall
-include ::standard
-
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/role/manifests/wmcs/openstack/main/control.pp 
b/modules/role/manifests/wmcs/openstack/main/control.pp
index ae03aa8..8531daa 100644
--- a/modules/role/manifests/wmcs/openstack/main/control.pp
+++ b/modules/role/manifests/wmcs/openstack/main/control.pp
@@ -1,6 +1,7 @@
 class role::wmcs::openstack::main::control {
 system::role { $name: }
 include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::rabbitmq
 include ::profile::openstack::main::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/main/services_primary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
index eb4b1ec..ca0e8a4 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_primary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::services_primary {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::pdns::auth::db
 include ::profile::openstack::main::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/main/services_secondary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
index 1653e6a..ed2c8b1 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::services_secondary {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::pdns::auth::db
 include ::profile::openstack::main::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/main/wikitech.pp 
b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
index a6997ed..1496a4f 100644
--- a/modules/role/manifests/wmcs/openstack/main/wikitech.pp
+++ b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::wikitech {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::clientlib
 include ::profile::openstack::main::wikitech::service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife0ca839c9e821c7fa8bfdbd4a92d67af2782d4d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack::main: move standard/firewall includes to roles

2018-01-23 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/406003 )

Change subject: openstack::main: move standard/firewall includes to roles
..

openstack::main: move standard/firewall includes to roles

Change-Id: Ife0ca839c9e821c7fa8bfdbd4a92d67af2782d4d
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
M modules/role/manifests/wmcs/openstack/main/services_primary.pp
M modules/role/manifests/wmcs/openstack/main/services_secondary.pp
M modules/role/manifests/wmcs/openstack/main/wikitech.pp
5 files changed, 7 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/406003/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 0eda878..31ea2e4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -907,15 +907,11 @@
 # and the powerdns auth and recursive services for instances.
 node 'labservices1001.wikimedia.org' {
 role(wmcs::openstack::main::services_primary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
 node 'labservices1002.wikimedia.org' {
 role(wmcs::openstack::main::services_secondary)
-include ::standard
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1082,8 +1078,6 @@
 
 node 'labcontrol1001.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1095,8 +1089,6 @@
 #  'keystone endpoint-create' and 'keystone endpoint-delete.'
 node 'labcontrol1002.wikimedia.org' {
 role(wmcs::openstack::main::control)
-
-include ::base::firewall
 include ::ldap::role::client::labs
 }
 
@@ -1929,9 +1921,6 @@
 node 'silver.wikimedia.org' {
 role(wmcs::openstack::main::wikitech)
 include ::role::mariadb::wikitech
-include ::base::firewall
-include ::standard
-
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/role/manifests/wmcs/openstack/main/control.pp 
b/modules/role/manifests/wmcs/openstack/main/control.pp
index ae03aa8..8531daa 100644
--- a/modules/role/manifests/wmcs/openstack/main/control.pp
+++ b/modules/role/manifests/wmcs/openstack/main/control.pp
@@ -1,6 +1,7 @@
 class role::wmcs::openstack::main::control {
 system::role { $name: }
 include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::observerenv
 include ::profile::openstack::main::rabbitmq
 include ::profile::openstack::main::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/main/services_primary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
index eb4b1ec..ca0e8a4 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_primary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::services_primary {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::pdns::auth::db
 include ::profile::openstack::main::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/main/services_secondary.pp 
b/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
index 1653e6a..ed2c8b1 100644
--- a/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
+++ b/modules/role/manifests/wmcs/openstack/main/services_secondary.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::services_secondary {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::pdns::auth::db
 include ::profile::openstack::main::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/main/wikitech.pp 
b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
index a6997ed..1496a4f 100644
--- a/modules/role/manifests/wmcs/openstack/main/wikitech.pp
+++ b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
@@ -1,5 +1,7 @@
 class role::wmcs::openstack::main::wikitech {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::cloudrepo
 include ::profile::openstack::main::clientlib
 include ::profile::openstack::main::wikitech::service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife0ca839c9e821c7fa8bfdbd4a92d67af2782d4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org