Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291819
Change subject: networks::constants: use slice_network_constants
......................................................................
networks::constants: use slice_network_constants
Use the newly introduced slice_network_constants() function to create
$mw_appserver_networks and $analytics_networks simply and without too
much fuss or need to maintain
Change-Id: I172a317dea23dba3f2a53aacd4406bd68ef04ddd
---
M modules/network/manifests/constants.pp
1 file changed, 10 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/291819/1
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index 810723a..80e7545 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -1,6 +1,8 @@
class network::constants {
- # Dummy notify to also specing hiera lookups. Do not remove
+ # Dummy resource to allow RSpec to work with hiera lookups. Without it
RSpec
+ # will not load hiera settings and unrelated tests about functions in this
+ # module will fail. Any resource would be, but this class has none
notify { 'dummy': message => '' }
# Note this name is misleading. Most of these are "external" networks,
@@ -101,29 +103,12 @@
# Networks hosting MediaWiki application servers
if $::realm == 'production' {
# TODO: Revisit this structure in the future
- $mw_appserver_networks =
- [
- '208.80.152.0/22', # external
- '2620:0:860::/46', # all external previous was for silver
- '10.64.37.14/32', # nobelium, temporary mw install to copy
over es indices
- '2620:0:861:119:f21f:afff:fee8:b1fb/64', # same as ^
-
$all_network_subnets['production']['eqiad']['private']['private1-a-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['private1-a-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['private1-b-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['private1-b-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['private1-c-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['private1-c-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['private1-d-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['private1-d-eqiad']['ipv6'],
-
$all_network_subnets['production']['codfw']['private']['private1-a-codfw']['ipv4'],
-
$all_network_subnets['production']['codfw']['private']['private1-a-codfw']['ipv6'],
-
$all_network_subnets['production']['codfw']['private']['private1-b-codfw']['ipv4'],
-
$all_network_subnets['production']['codfw']['private']['private1-b-codfw']['ipv6'],
-
$all_network_subnets['production']['codfw']['private']['private1-c-codfw']['ipv4'],
-
$all_network_subnets['production']['codfw']['private']['private1-c-codfw']['ipv6'],
-
$all_network_subnets['production']['codfw']['private']['private1-d-codfw']['ipv4'],
-
$all_network_subnets['production']['codfw']['private']['private1-d-codfw']['ipv6'],
- ]
+ $mw_appserver_networks = flatten([
+ slice_network_constants('production', { 'sphere' => 'public' }),
+ slice_network_constants('production', {
+ 'sphere' => 'private',
+ 'description' => 'private' }),
+ ])
} elsif $::realm == 'labs' {
# rely on security groups in labs to restrict this
$mw_appserver_networks = ['10.0.0.0/8', '127.0.0.1']
@@ -133,16 +118,7 @@
}
# Analytics subnets
- $analytics_networks = [
-
$all_network_subnets['production']['eqiad']['private']['analytics1-a-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-a-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-b-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-b-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-c-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-c-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-d-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-d-eqiad']['ipv6'],
- ]
+ $analytics_networks = slice_network_constants('production', {
'description' => 'analytics'})
# Networks that trebuchet/git-deploy
# will be able to deploy to.
--
To view, visit https://gerrit.wikimedia.org/r/291819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I172a317dea23dba3f2a53aacd4406bd68ef04ddd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
