Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404790 )
Change subject: labtest: move firewall/standard includes to roles
......................................................................
labtest: move firewall/standard includes to roles
Change-Id: I95b3dfd8e37eabde3ba462c3a5646bda1d384262
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/labtest/control.pp
M modules/role/manifests/wmcs/openstack/labtest/net.pp
M modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
M modules/role/manifests/wmcs/openstack/labtest/services.pp
M modules/role/manifests/wmcs/openstack/labtest/web.pp
M modules/role/manifests/wmcs/openstack/labtestn/control.pp
M modules/role/manifests/wmcs/openstack/labtestn/services.pp
8 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/404790/1
diff --git a/manifests/site.pp b/manifests/site.pp
index bb5c409..af38872 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -948,25 +948,18 @@
node 'labtestnet2001.codfw.wmnet' {
role(wmcs::openstack::labtest::net)
- include ::standard
}
node 'labtestcontrol2001.wikimedia.org' {
role(wmcs::openstack::labtest::control)
- include ::standard
- include ::base::firewall
}
node 'labtestcontrol2003.wikimedia.org' {
role(wmcs::openstack::labtestn::control)
- include ::standard
- include ::base::firewall
}
node 'labtestpuppetmaster2001.wikimedia.org' {
role(wmcs::openstack::labtest::puppetmaster::frontend)
- include ::standard
- include ::base::firewall
interface::add_ip6_mapped { 'main': }
}
@@ -978,7 +971,6 @@
node /labtestservices200[23]\.wikimedia\.org/ {
role(wmcs::openstack::labtestn::services)
- include ::base::firewall
interface::add_ip6_mapped { 'main': }
}
@@ -1122,7 +1114,6 @@
node 'labtestweb2001.wikimedia.org' {
role(wmcs::openstack::labtest::web)
include ::role::mariadb::wikitech
- include ::base::firewall
include ::ldap::role::client::labs
interface::add_ip6_mapped { 'main': }
diff --git a/modules/role/manifests/wmcs/openstack/labtest/control.pp
b/modules/role/manifests/wmcs/openstack/labtest/control.pp
index 8e23130..d9cd896 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/control.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/control.pp
@@ -1,5 +1,7 @@
class role::wmcs::openstack::labtest::control {
system::role { $name: }
+ include ::standard
+ include ::profile::base::firewall
include ::profile::openstack::labtest::observerenv
include ::profile::openstack::labtest::rabbitmq
include ::profile::openstack::labtest::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/labtest/net.pp
b/modules/role/manifests/wmcs/openstack/labtest/net.pp
index d0e98dd..dfa2c6c 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/net.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/net.pp
@@ -1,5 +1,6 @@
class role::wmcs::openstack::labtest::net {
system::role { $name: }
+ include ::standard
include ::profile::openstack::labtest::cloudrepo
include ::profile::openstack::labtest::nova::common
include ::profile::openstack::labtest::nova::network::service
diff --git
a/modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
b/modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
index aa7f4df..3925ed5 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
@@ -1,5 +1,7 @@
class role::wmcs::openstack::labtest::puppetmaster::frontend {
system::role { $name: }
+ include ::standard
+ include ::profile::base::firewall
include ::profile::openstack::labtest::clientlib
include ::profile::openstack::labtest::observerenv
include ::profile::openstack::labtest::puppetmaster::frontend
diff --git a/modules/role/manifests/wmcs/openstack/labtest/services.pp
b/modules/role/manifests/wmcs/openstack/labtest/services.pp
index 94796a0..e569c58 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/services.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/services.pp
@@ -1,5 +1,7 @@
class role::wmcs::openstack::labtest::services {
system::role { $name: }
+ include ::standard
+ include ::profile::base::firewall
include ::profile::openstack::labtest::cloudrepo
include ::profile::openstack::labtest::pdns::auth::db
include ::profile::openstack::labtest::pdns::auth::service
diff --git a/modules/role/manifests/wmcs/openstack/labtest/web.pp
b/modules/role/manifests/wmcs/openstack/labtest/web.pp
index f45d26f..cbff3c7 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/web.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/web.pp
@@ -1,6 +1,7 @@
class role::wmcs::openstack::labtest::web {
system::role { $name: }
include ::standard
+ include ::profile::base::firewall
include ::profile::openstack::labtest::cloudrepo
include ::profile::openstack::labtest::clientlib
include ::profile::openstack::labtest::observerenv
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/control.pp
b/modules/role/manifests/wmcs/openstack/labtestn/control.pp
index 32b444f..c93a670 100644
--- a/modules/role/manifests/wmcs/openstack/labtestn/control.pp
+++ b/modules/role/manifests/wmcs/openstack/labtestn/control.pp
@@ -1,5 +1,7 @@
class role::wmcs::openstack::labtestn::control {
system::role { $name: }
+ include ::standard
+ include ::profile::base::firewall
include ::profile::openstack::labtestn::observerenv
include ::profile::openstack::labtestn::rabbitmq
include ::profile::openstack::labtestn::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/services.pp
b/modules/role/manifests/wmcs/openstack/labtestn/services.pp
index 4511a93..cc2a331 100644
--- a/modules/role/manifests/wmcs/openstack/labtestn/services.pp
+++ b/modules/role/manifests/wmcs/openstack/labtestn/services.pp
@@ -1,5 +1,6 @@
class role::wmcs::openstack::labtestn::services {
system::role { $name: }
include ::standard
+ include ::profile::base::firewall
include ::profile::openstack::labtestn::cloudrepo
}
--
To view, visit https://gerrit.wikimedia.org/r/404790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95b3dfd8e37eabde3ba462c3a5646bda1d384262
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
