Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399542 )
Change subject: wmcs/labs: move more firewall/standard includes into roles
......................................................................
wmcs/labs: move more firewall/standard includes into roles
Change-Id: I42cd6cfd50628b7b96ef479a78162a0c37f4c48b
---
M manifests/site.pp
M modules/role/manifests/labs/nfs/secondary_backup/misc.pp
M modules/role/manifests/labs/nfs/secondary_backup/tools.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/main/control.pp
M modules/role/manifests/wmcs/openstack/main/horizon.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
M modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.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
16 files changed, 28 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/399542/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 96a2af1..7bd0b38 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -135,10 +135,7 @@
node 'californium.wikimedia.org' {
role(wmcs::openstack::main::horizon,
striker::web)
- include ::standard
- include ::base::firewall
include ::ldap::role::client::labs
-
interface::add_ip6_mapped { 'main': }
}
@@ -906,15 +903,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': }
}
@@ -922,15 +915,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
}
@@ -947,9 +936,7 @@
}
node 'labtestmetal2001.codfw.wmnet' {
- # WIP
- include ::standard
- include ::base::firewall
+ role(test)
}
node 'labtestnet2002.codfw.wmnet' {
@@ -957,32 +944,23 @@
}
node 'labtestneutron2002.codfw.wmnet' {
- # WIP
- include ::standard
- include ::base::firewall
+ role(test)
}
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': }
}
@@ -994,7 +972,6 @@
node /labtestservices200[23]\.wikimedia\.org/ {
role(wmcs::openstack::labtestn::services)
- include ::base::firewall
interface::add_ip6_mapped { 'main': }
}
@@ -1134,14 +1111,11 @@
}
node /labcontrol100[34]\.wikimedia\.org/ {
- include ::base::firewall
- include ::standard
+ role(test)
}
node 'labcontrol1001.wikimedia.org' {
role(wmcs::openstack::main::control)
-
- include ::base::firewall
include ::ldap::role::client::labs
}
@@ -1153,8 +1127,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
}
@@ -1164,7 +1136,6 @@
node 'labtestweb2001.wikimedia.org' {
role(wmcs::openstack::labtest::web,
mariadb::wikitech)
- include ::base::firewall
include ::ldap::role::client::labs
interface::add_ip6_mapped { 'main': }
@@ -1262,14 +1233,12 @@
node 'labstore2003.codfw.wmnet' {
role(labs::nfs::secondary_backup::tools)
- include ::standard
# Do not enable yet
# include ::base::firewall
}
node 'labstore2004.codfw.wmnet' {
role(labs::nfs::secondary_backup::misc)
- include ::standard
# Do not enable yet
# include ::base::firewall
}
@@ -2019,9 +1988,6 @@
node 'silver.wikimedia.org' {
role(wmcs::openstack::main::wikitech,
mariadb::wikitech)
- include ::base::firewall
- include ::standard
-
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
index cd910bd..ceb2766 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
@@ -1,5 +1,6 @@
class role::labs::nfs::secondary_backup::misc {
+ include ::standard
include role::labs::nfs::secondary_backup::base
file { '/srv/backup/misc':
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
index fd7c4c5..827c7fd 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
@@ -1,5 +1,6 @@
class role::labs::nfs::secondary_backup::tools {
+ include ::standard
include role::labs::nfs::secondary_backup::base
file { '/srv/backup/tools':
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..6ba6419 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 ::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/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/horizon.pp
b/modules/role/manifests/wmcs/openstack/main/horizon.pp
index 9f1587b..20c5a98 100644
--- a/modules/role/manifests/wmcs/openstack/main/horizon.pp
+++ b/modules/role/manifests/wmcs/openstack/main/horizon.pp
@@ -2,6 +2,8 @@
# role::wmcs::openstack::main::web when labweb* is finished
class role::wmcs::openstack::main::horizon {
system::role { $name: }
+ include ::standard
+ include ::profile::base::firewall
include ::profile::openstack::main::cloudrepo
include ::profile::openstack::main::observerenv
include ::profile::openstack::main::horizon::dashboard
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
diff --git a/modules/role/manifests/wmcs/openstack/main/services_primary.pp
b/modules/role/manifests/wmcs/openstack/main/services_primary.pp
index 754ce0b..90a0f00 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/399542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42cd6cfd50628b7b96ef479a78162a0c37f4c48b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
