BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389741 )
Change subject: eqsin: basics
......................................................................
eqsin: basics
This is only basic site definitions and network ranges. Does not
cover specific hosts to-be-installed, some site parameters use
remote sites for bootstrapping, no cache/lvs/bast/ipsec yet,
etc...
Bug: T156027
Change-Id: If75ab4cb1990caa400be55a8c552d4db7d7e9ef1
---
M hieradata/common.yaml
M hieradata/common/monitoring.yaml
A hieradata/eqsin/confd.yaml
M hieradata/hosts/einsteinium.yaml
M hieradata/hosts/iron.yaml
M hieradata/hosts/palladium.yaml
M hieradata/hosts/tegmen.yaml
M hieradata/labs/puppet3-diffs/common.yaml
M hieradata/role/common/bastionhost/general.yaml
M hieradata/role/common/prometheus/ops.yaml
M manifests/realm.pp
M modules/authdns/files/discovery-map
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/subnets/private1-eqsin.cfg
A modules/install_server/files/autoinstall/subnets/public1-eqsin.cfg
M modules/install_server/files/dhcpd/dhcpd.conf
M modules/mariadb/files/check_mariadb.py
M modules/network/data/data.yaml
M modules/profile/manifests/pmacct.pp
M modules/profile/manifests/puppetmaster/backend.pp
M modules/profile/manifests/puppetmaster/frontend.pp
M modules/profile/templates/cumin/aliases.yaml.erb
M modules/puppetmaster/manifests/init.pp
M modules/role/manifests/librenms.pp
M modules/role/manifests/ntp.pp
M modules/role/templates/exim/exim4.conf.mx.erb
M modules/standard/manifests/ntp.pp
M modules/standard/manifests/ntp/client.pp
M modules/standard/manifests/ntp/timesyncd.pp
M typos
30 files changed, 149 insertions(+), 23 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 35b407c..4b8594c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -4,6 +4,7 @@
- codfw
- esams
- ulsfo
+ - eqsin
# Main statsd instance
statsd: statsd.eqiad.wmnet:8125
diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index 83b5296..be206a9 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -20,6 +20,8 @@
description: esams text Varnish
cache_text_ulsfo:
description: ulsfo text Varnish
+ cache_text_eqsin:
+ description: eqsin text Varnish
cache_upload_codfw:
description: codfw upload Varnish
cache_upload_eqiad:
@@ -28,6 +30,8 @@
description: esams upload Varnish
cache_upload_ulsfo:
description: ulsfo upload Varnish
+ cache_upload_eqsin:
+ description: eqsin upload Varnish
cache_misc_codfw:
description: Misc caches codfw
cache_misc_eqiad:
@@ -120,6 +124,8 @@
description: ulsfo LVS servers
lvs_esams:
description: esams LVS servers
+ lvs_eqsin:
+ description: eqsin LVS servers
# Logstash
logstash_eqiad:
@@ -245,6 +251,8 @@
description: esams misc servers
misc_ulsfo:
description: ulsfo misc servers
+ misc_eqsin:
+ description: eqsin misc servers
# Facilities
pdus:
diff --git a/hieradata/eqsin/confd.yaml b/hieradata/eqsin/confd.yaml
new file mode 100644
index 0000000..58bfc74
--- /dev/null
+++ b/hieradata/eqsin/confd.yaml
@@ -0,0 +1 @@
+confd::srv_dns: 'eqsin.wmnet'
diff --git a/hieradata/hosts/einsteinium.yaml b/hieradata/hosts/einsteinium.yaml
index b2491d8..968cdfaf 100644
--- a/hieradata/hosts/einsteinium.yaml
+++ b/hieradata/hosts/einsteinium.yaml
@@ -4,6 +4,7 @@
- codfw.wmnet
- esams.wmnet
- ulsfo.wmnet
+ - eqsin.wmnet
role::icinga::partner: tegmen.wikimedia.org
# Note that our paging infrastructure (AQL as of 20161101) may need an update
of it's sender whitelist
role::tcpircbot::ensure: present
diff --git a/hieradata/hosts/iron.yaml b/hieradata/hosts/iron.yaml
index d656abf..78ca4dd 100644
--- a/hieradata/hosts/iron.yaml
+++ b/hieradata/hosts/iron.yaml
@@ -4,5 +4,6 @@
- codfw.wmnet
- esams.wmnet
- ulsfo.wmnet
+ - eqsin.wmnet
admin::groups:
- datacenter-ops
diff --git a/hieradata/hosts/palladium.yaml b/hieradata/hosts/palladium.yaml
index a398352..b3e0545 100644
--- a/hieradata/hosts/palladium.yaml
+++ b/hieradata/hosts/palladium.yaml
@@ -4,3 +4,4 @@
- codfw.wmnet
- esams.wmnet
- ulsfo.wmnet
+ - eqsin.wmnet
diff --git a/hieradata/hosts/tegmen.yaml b/hieradata/hosts/tegmen.yaml
index 9504215..5400a14da 100644
--- a/hieradata/hosts/tegmen.yaml
+++ b/hieradata/hosts/tegmen.yaml
@@ -4,6 +4,7 @@
- codfw.wmnet
- esams.wmnet
- ulsfo.wmnet
+ - eqsin.wmnet
role::icinga::partner: einsteinium.wikimedia.org
# Note that our paging infrastructure (AQL as of 20161101) may need an update
of it's sender whitelist
# tegmen is the backup icinga server. All these flags need to be converted
accordingly for it to assume the identity of the primary
diff --git a/hieradata/labs/puppet3-diffs/common.yaml
b/hieradata/labs/puppet3-diffs/common.yaml
index 2fecdfb..da49291 100644
--- a/hieradata/labs/puppet3-diffs/common.yaml
+++ b/hieradata/labs/puppet3-diffs/common.yaml
@@ -11,3 +11,4 @@
- codfw.wmnet
- esams.wmnet
- ulsfo.wmnet
+ - eqsin.wmnet
diff --git a/hieradata/role/common/bastionhost/general.yaml
b/hieradata/role/common/bastionhost/general.yaml
index 2da9380..3f8f20e 100644
--- a/hieradata/role/common/bastionhost/general.yaml
+++ b/hieradata/role/common/bastionhost/general.yaml
@@ -5,5 +5,6 @@
- codfw.wmnet
- esams.wmnet
- ulsfo.wmnet
+ - eqsin.wmnet
admin::groups:
- all-users
diff --git a/hieradata/role/common/prometheus/ops.yaml
b/hieradata/role/common/prometheus/ops.yaml
index 59f2002..16732f8 100644
--- a/hieradata/role/common/prometheus/ops.yaml
+++ b/hieradata/role/common/prometheus/ops.yaml
@@ -4,4 +4,5 @@
- codfw.wmnet
- esams.wmnet
- ulsfo.wmnet
+ - eqsin.wmnet
standard::has_ganglia: false
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 037e745..17f0675 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -13,6 +13,8 @@
/^198\.35\.26\./ => 'ulsfo',
/^10\.128\./ => 'ulsfo',
/^10\.20\.0\./ => 'esams',
+ /^103\.102\.166\./ => 'eqsin',
+ /^10\.132\./ => 'eqsin',
default => '(undefined)'
}
@@ -97,6 +99,7 @@
'codfw' => [ '208.80.153.254', '208.80.154.254' ], # codfw -> codfw,
eqiad
'ulsfo' => [ '208.80.153.254', '208.80.154.254' ], # ulsfo -> codfw,
eqiad
'esams' => [ '91.198.174.216', '208.80.154.254' ], # esams -> esams,
eqiad
+ 'eqsin' => [ '208.80.153.254', '208.80.154.254' ], # eqsin -> codfw,
eqiad
default => [ '208.80.154.254', '208.80.153.254' ], # -> eqiad,
codfw
}
}
diff --git a/modules/authdns/files/discovery-map
b/modules/authdns/files/discovery-map
index 06f822b..bb8ca21 100644
--- a/modules/authdns/files/discovery-map
+++ b/modules/authdns/files/discovery-map
@@ -4,25 +4,29 @@
map => { default => [eqiad codfw] }
nets => {
# Wikimedia address space
- 208.80.152.0/23 => [codfw, eqiad], # codfw
- 208.80.154.0/23 => [eqiad, codfw], # eqiad
- 91.198.174.0/24 => [eqiad, codfw], # esams
- 185.15.56.0/22 => [eqiad, codfw], # esams
- 198.35.26.0/23 => [codfw, eqiad], # ulsfo
- 2620:0:860::/48 => [codfw, eqiad], # codfw
- 2620:0:861::/48 => [eqiad, codfw], # eqiad
- 2620:0:862::/48 => [eqiad, codfw], # esams
- 2620:0:863::/48 => [codfw, eqiad], # ulsfo
- 198.73.209.0/24 => [codfw, eqiad], # WMF OIT
- 2620:62:c000::/48 => [codfw, eqiad], # WMF OIT
+ 208.80.152.0/23 => [codfw, eqiad], # codfw
+ 208.80.154.0/23 => [eqiad, codfw], # eqiad
+ 91.198.174.0/24 => [eqiad, codfw], # esams
+ 185.15.56.0/22 => [eqiad, codfw], # esams
+ 198.35.26.0/23 => [codfw, eqiad], # ulsfo
+ 103.102.166.0/24 => [codfw, eqiad], # eqsin
+ 2620:0:860::/48 => [codfw, eqiad], # codfw
+ 2620:0:861::/48 => [eqiad, codfw], # eqiad
+ 2620:0:862::/48 => [eqiad, codfw], # esams
+ 2620:0:863::/48 => [codfw, eqiad], # ulsfo
+ 2001:df2:e500::/48 => [codfw, eqiad], # eqsin
+ 198.73.209.0/24 => [codfw, eqiad], # WMF OIT
+ 2620:62:c000::/48 => [codfw, eqiad], # WMF OIT
# Wikimedia 10/8 private space
- 10.2.1.0/24 => [codfw, eqiad], # codfw LVS
- 10.2.2.0/24 => [eqiad, codfw], # eqiad LVS
- 10.2.3.0/24 => [eqiad, codfw], # esams LVS
- 10.2.4.0/24 => [codfw, eqiad], # ulsfo LVS
- 10.20.0.0/23 => [eqiad, codfw], # esams private/mgmt
- 10.64.0.0/12 => [eqiad, codfw], # eqiad private/mgmt
- 10.128.0.0/16 => [codfw, eqiad], # ulsfo private/mgmt
- 10.192.0.0/12 => [codfw, eqiad], # codfw private/mgmt
+ 10.2.1.0/24 => [codfw, eqiad], # codfw LVS
+ 10.2.2.0/24 => [eqiad, codfw], # eqiad LVS
+ 10.2.3.0/24 => [eqiad, codfw], # esams LVS
+ 10.2.4.0/24 => [codfw, eqiad], # ulsfo LVS
+ 10.2.5.0/24 => [codfw, eqiad], # eqsin LVS
+ 10.20.0.0/23 => [eqiad, codfw], # esams private/mgmt
+ 10.64.0.0/12 => [eqiad, codfw], # eqiad private/mgmt
+ 10.128.0.0/16 => [codfw, eqiad], # ulsfo private/mgmt
+ 10.132.0.0/16 => [codfw, eqiad], # eqsin private/mgmt
+ 10.192.0.0/12 => [codfw, eqiad], # codfw private/mgmt
}
}
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 8593921..ede9fe6 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -34,6 +34,7 @@
10.64.53.1) echo subnets/analytics1-d-eqiad.cfg ;; \
10.64.37.1) echo subnets/labs-support1-c-eqiad.cfg ;; \
10.128.0.1) echo subnets/private1-ulsfo.cfg ;; \
+ 10.132.0.1) echo subnets/private1-eqsin.cfg ;; \
10.192.0.1) echo subnets/private1-a-codfw.cfg ;; \
10.192.16.1) echo subnets/private1-b-codfw.cfg ;; \
10.192.20.1) echo subnets/labs-hosts1-b-codfw.cfg ;; \
@@ -42,6 +43,7 @@
10.192.48.1) echo subnets/private1-d-codfw.cfg ;; \
91.198.174.1) echo subnets/public1-esams.cfg ;; \
198.35.26.1) echo subnets/public1-ulsfo.cfg ;; \
+ 103.102.166.1) echo subnets/public1-eqsin.cfg ;; \
10.20.0.1) echo subnets/private1-esams.cfg ;; \
esac; \
\
diff --git
a/modules/install_server/files/autoinstall/subnets/private1-eqsin.cfg
b/modules/install_server/files/autoinstall/subnets/private1-eqsin.cfg
new file mode 100644
index 0000000..302e977
--- /dev/null
+++ b/modules/install_server/files/autoinstall/subnets/private1-eqsin.cfg
@@ -0,0 +1,15 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string eqsin.wmnet
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.255.0
+d-i netcfg/get_gateway string 10.132.0.1
+d-i netcfg/get_nameservers string 208.80.154.254 208.80.153.254
+d-i netcfg/confirm_static boolean true
+
+d-i mirror/http/proxy string http://webproxy.eqsin.wmnet:8080
+
+# NTP
+d-i clock-setup/ntp-server string ntp.ulsfo.wikimedia.org
diff --git a/modules/install_server/files/autoinstall/subnets/public1-eqsin.cfg
b/modules/install_server/files/autoinstall/subnets/public1-eqsin.cfg
new file mode 100644
index 0000000..426f7cd
--- /dev/null
+++ b/modules/install_server/files/autoinstall/subnets/public1-eqsin.cfg
@@ -0,0 +1,13 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-i netcfg/get_domain string wikimedia.org
+
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_netmask string 255.255.255.240
+d-i netcfg/get_gateway string 103.102.166.1
+d-i netcfg/get_nameservers string 208.80.154.254 208.80.153.254
+d-i netcfg/confirm_static boolean true
+
+# NTP
+d-i clock-setup/ntp-server string ntp.ulsfo.wikimedia.org
diff --git a/modules/install_server/files/dhcpd/dhcpd.conf
b/modules/install_server/files/dhcpd/dhcpd.conf
index b33e00a..65a7fbf 100644
--- a/modules/install_server/files/dhcpd/dhcpd.conf
+++ b/modules/install_server/files/dhcpd/dhcpd.conf
@@ -417,6 +417,34 @@
}
#
+# eqsin
+#
+
+# public1-eqsin subnet
+subnet 103.102.166.0 netmask 255.255.255.240 {
+ authoritative;
+
+ option subnet-mask 255.255.255.240;
+ option broadcast-address 103.102.166.15;
+ option routers 103.102.166.1;
+ option domain-name "wikimedia.org";
+
+ next-server 198.35.26.5; # bast4001 (tftp server)
+}
+
+# private1-eqsin subnet
+subnet 10.132.0.0 netmask 255.255.255.0 {
+ authoritative;
+
+ option subnet-mask 255.255.255.0;
+ option broadcast-address 10.132.0.255;
+ option routers 10.132.0.1;
+ option domain-name "eqsin.wmnet";
+
+ next-server 198.35.26.5; # bast4001 (tftp server)
+}
+
+#
# Linux installation hosts
#
group {
diff --git a/modules/mariadb/files/check_mariadb.py
b/modules/mariadb/files/check_mariadb.py
index 6758e33..03f2d97 100755
--- a/modules/mariadb/files/check_mariadb.py
+++ b/modules/mariadb/files/check_mariadb.py
@@ -119,6 +119,8 @@
domain = '.esams.wmnet'
elif re.match('^[a-z]+4[0-9][0-9][0-9]$', host) is not None:
domain = '.ulsfo.wmnet'
+ elif re.match('^[a-z]+5[0-9][0-9][0-9]$', host) is not None:
+ domain = '.eqsin.wmnet'
else:
localhost_fqdn = socket.getfqdn()
if '.' in localhost_fqdn and len(localhost_fqdn) > 1:
diff --git a/modules/network/data/data.yaml b/modules/network/data/data.yaml
index f98fd27..8066823 100644
--- a/modules/network/data/data.yaml
+++ b/modules/network/data/data.yaml
@@ -5,6 +5,8 @@
- 198.35.26.0/23
- 185.15.56.0/22
- 2a02:ec80::/32
+- 2001:df2:e500::/48
+- 103.102.166.0/24
network::infrastructure:
- 91.198.174.224/27 # esams
@@ -15,12 +17,15 @@
- 2620:0:860:fe00::/55 # codfw
- 208.80.154.192/27 # eqiad
- 2620:0:861:fe00::/55 # eqiad
+ - 103.102.166.128/27 # eqsin
+ - 2001:df2:e500:fe00::/56 # eqsin
network::management:
- 10.65.0.0/16 # eqiad
- 10.128.128.0/17 # ulsfo
- 10.193.0.0/16 # codfw
- 10.21.0.0/24 # esams
+ - 10.132.128.0/17 # eqsin
network::subnets:
production:
@@ -157,6 +162,20 @@
ipv6: 2620:0:863:101::/64
private1-lvs-ulsfo:
ipv4: 10.2.4.0/24
+ eqsin:
+ public:
+ public1-eqsin:
+ ipv4: 103.102.166.0/28
+ ipv6: 2001:df2:e500:1::/64
+ public1-lvs-eqsin:
+ ipv4: 103.102.166.224/27
+ ipv6: 2001:df2:e500:ed1a::/64
+ private:
+ private1-eqsin:
+ ipv4: 10.132.0.0/24
+ ipv6: 2001:df2:e500:101::/64
+ private1-lvs-eqsin:
+ ipv4: 10.2.5.0/24
frack:
eqiad:
public:
@@ -208,6 +227,11 @@
sandbox1-ulsfo:
ipv4: 198.35.26.240/28
ipv6: 2620:0:863:201::/64
+ eqsin:
+ public:
+ sandbox1-eqsin:
+ ipv4: 103.102.166.16/28
+ ipv6: 2001:df2:e500:201::/64
labs:
eqiad:
private:
diff --git a/modules/profile/manifests/pmacct.pp
b/modules/profile/manifests/pmacct.pp
index 0805532..a5c94c4 100644
--- a/modules/profile/manifests/pmacct.pp
+++ b/modules/profile/manifests/pmacct.pp
@@ -52,6 +52,9 @@
# ulsfo
'198.35.26.192/30',
'2620:0:863:ffff::/64',
+ # eqsin
+ '103.102.166.128/30',
+ '2001:df2:e500:ffff::/56',
]
ferm::service { 'bgp':
diff --git a/modules/profile/manifests/puppetmaster/backend.pp
b/modules/profile/manifests/puppetmaster/backend.pp
index 08b4d0d..e97cfa8 100644
--- a/modules/profile/manifests/puppetmaster/backend.pp
+++ b/modules/profile/manifests/puppetmaster/backend.pp
@@ -12,7 +12,8 @@
'*.eqiad.wmnet',
'*.ulsfo.wmnet',
'*.esams.wmnet',
- '*.codfw.wmnet'],
+ '*.codfw.wmnet',
+ '*.eqsin.wmnet'],
$extra_auth_rules = '',
) {
diff --git a/modules/profile/manifests/puppetmaster/frontend.pp
b/modules/profile/manifests/puppetmaster/frontend.pp
index b8a69f9..6d26ca1 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -13,7 +13,8 @@
'*.eqiad.wmnet',
'*.ulsfo.wmnet',
'*.esams.wmnet',
- '*.codfw.wmnet'],
+ '*.codfw.wmnet',
+ '*.eqsin.wmnet'],
$extra_auth_rules = '',
) {
backup::set { 'var-lib-puppet-ssl': }
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index f38a660..fb60525 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -22,6 +22,7 @@
cp-eqiad: A:cp and A:eqiad
cp-esams: A:cp and A:esams
cp-ulsfo: A:cp and A:ulsfo
+cp-eqsin: A:cp and A:eqsin
<% [ 'text', 'upload', 'misc' ].each do |cache| -%>
cp-<%= cache %>: P{O:cache::<%= cache %>}
<% @datacenters.each do |dc| -%>
@@ -101,6 +102,7 @@
lvs-eqiad: A:lvs and A:eqiad
lvs-esams: A:lvs and A:esams
lvs-ulsfo: A:lvs and A:ulsfo
+lvs-eqsin: A:lvs and A:eqsin
maps: P{O:maps::master or O:maps::slave or O:maps::test::slave or
O:maps::test::master}
maps-canary: P{maps1001.eqiad.wmnet}
maps-test: P{O:maps::test::master or O:maps::test::slave or
O:maps::test::vectortiles_master}
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 9c13998..9846199 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -51,6 +51,7 @@
'*.ulsfo.wmnet',
'*.esams.wmnet',
'*.codfw.wmnet',
+ '*.eqsin.wmnet',
],
$is_git_master=false,
$hiera_config=$::realm,
diff --git a/modules/role/manifests/librenms.pp
b/modules/role/manifests/librenms.pp
index 886b0f5..7bdcb63 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -80,6 +80,7 @@
'65002' => 'confed-eqdfw-codfw',
'65003' => 'confed-esams',
'65004' => 'confed-ulsfo',
+ '65005' => 'confed-eqsin',
'65517' => 'Equinix',
},
'email_from' => 'librenms',
diff --git a/modules/role/manifests/ntp.pp b/modules/role/manifests/ntp.pp
index 26a21c9..df51855 100644
--- a/modules/role/manifests/ntp.pp
+++ b/modules/role/manifests/ntp.pp
@@ -11,7 +11,8 @@
$wmf_peers['eqiad'],
$wmf_peers['codfw'],
$wmf_peers['esams'],
- $wmf_peers['ulsfo']
+ $wmf_peers['ulsfo'],
+ $wmf_peers['eqsin']
)
# NOTE to the future: we *should* be using regional
@@ -71,8 +72,11 @@
'91.198.174.0 mask 255.255.255.0',
'198.35.26.0 mask 255.255.254.0',
'185.15.56.0 mask 255.255.252.0',
+ '103.102.166.0 mask 255.255.255.0',
'2620:0:860:: mask ffff:ffff:fffc::',
- '2a02:ec80:: mask ffff:ffff::',]
+ '2a02:ec80:: mask ffff:ffff::',
+ '2001:df2:e500:: mask ffff:ffff:ffff::',
+ ]
ntp::daemon { 'server':
diff --git a/modules/role/templates/exim/exim4.conf.mx.erb
b/modules/role/templates/exim/exim4.conf.mx.erb
index e3bd335..254a4cf 100644
--- a/modules/role/templates/exim/exim4.conf.mx.erb
+++ b/modules/role/templates/exim/exim4.conf.mx.erb
@@ -404,3 +404,4 @@
*@*.codfw.wmnet r...@wikimedia.org F
*@*.esams.wmnet r...@wikimedia.org F
*@*.ulsfo.wmnet r...@wikimedia.org F
+*@*.eqsin.wmnet r...@wikimedia.org F
diff --git a/modules/standard/manifests/ntp.pp
b/modules/standard/manifests/ntp.pp
index 29ddcdd..996a729 100644
--- a/modules/standard/manifests/ntp.pp
+++ b/modules/standard/manifests/ntp.pp
@@ -20,6 +20,7 @@
'maerlant.wikimedia.org', # esams recdns
],
ulsfo => [],
+ eqsin => [],
}
# ntp monitoring queries
diff --git a/modules/standard/manifests/ntp/client.pp
b/modules/standard/manifests/ntp/client.pp
index 41755f9..ee8d3d7 100644
--- a/modules/standard/manifests/ntp/client.pp
+++ b/modules/standard/manifests/ntp/client.pp
@@ -11,6 +11,7 @@
codfw => array_concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
esams => array_concat($wmf_peers['esams'], $wmf_peers['eqiad']),
ulsfo => array_concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
+ eqsin => array_concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
}
ntp::daemon { 'client':
diff --git a/modules/standard/manifests/ntp/timesyncd.pp
b/modules/standard/manifests/ntp/timesyncd.pp
index d6b0595..192c36b 100644
--- a/modules/standard/manifests/ntp/timesyncd.pp
+++ b/modules/standard/manifests/ntp/timesyncd.pp
@@ -16,6 +16,7 @@
codfw => concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
esams => concat($wmf_peers['esams'], $wmf_peers['eqiad']),
ulsfo => concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
+ eqsin => concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
}
file { '/etc/systemd/timesyncd.conf':
diff --git a/typos b/typos
index 53d4d51..9ff021a 100644
--- a/typos
+++ b/typos
@@ -19,6 +19,7 @@
(?<!WMF)[^2][[:digit:]]{3}\.codfw\.wmnet
(?<!WMF)[^3][[:digit:]]{3}\.(esams|knams)\.wmnet
(?<!WMF)[^4][[:digit:]]{3}\.ulsfo\.wmnet
+(?<!WMF)[^5][[:digit:]]{3}\.eqsin\.wmnet
criticial
puppte
pupet
--
To view, visit https://gerrit.wikimedia.org/r/389741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If75ab4cb1990caa400be55a8c552d4db7d7e9ef1
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
