[MediaWiki-commits] [Gerrit] operations/dns[master]: Assigning eqsin PCCW peering IPs

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/406011 )

Change subject: Assigning eqsin PCCW peering IPs
..


Assigning eqsin PCCW peering IPs

Change-Id: Ib3c0c0c9c43b9ee681caeaa98eff83f931600d8a
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/166.102.103.in-addr.arpa
2 files changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 65e4e65..7593fa7 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -64,7 +64,13 @@
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
 ; 2001:df2:e500:fe00::/56 - Infrastructure IPs
+
+; 2001:df2:e500:fe00::/64 - PCCW peering
 $ORIGIN 0.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-2-0-2.cr1-eqsin.wikimedia.org.
+;2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   TBD PCCW
+
+
 
 ; 2001:df2:e500:::/56 - Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index 5b4b585..ff525b6 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -38,6 +38,10 @@
 132 1H IN PTR   ae1-401.cr1-eqsin.wikimedia.org.
 133 1H IN PTR   ge-0-0-4-401.mr1-eqsin.wikimedia.org.
 
+; 103.102.166.134/31  -- PCCW peering
+134 1H IN PTR   xe-2-0-2.cr1-eqsin.wikimedia.org.
+; 135 1H IN PTR   PCCW TBD.
+
 ; 103.102.166.160/27 (160-191) - unused
 ; 103.102.166.192/27 (192-223) - unused
 ; 103.102.166.224/27 (224-255) - LVS Service IPs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3c0c0c9c43b9ee681caeaa98eff83f931600d8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Assigning eqsin PCCW peering IPs

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/406011 )

Change subject: Assigning eqsin PCCW peering IPs
..

Assigning eqsin PCCW peering IPs

Change-Id: Ib3c0c0c9c43b9ee681caeaa98eff83f931600d8a
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/166.102.103.in-addr.arpa
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/11/406011/1

diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 65e4e65..7593fa7 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -64,7 +64,13 @@
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
 ; 2001:df2:e500:fe00::/56 - Infrastructure IPs
+
+; 2001:df2:e500:fe00::/64 - PCCW peering
 $ORIGIN 0.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-2-0-2.cr1-eqsin.wikimedia.org.
+;2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   TBD PCCW
+
+
 
 ; 2001:df2:e500:::/56 - Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index 5b4b585..ff525b6 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -38,6 +38,10 @@
 132 1H IN PTR   ae1-401.cr1-eqsin.wikimedia.org.
 133 1H IN PTR   ge-0-0-4-401.mr1-eqsin.wikimedia.org.
 
+; 103.102.166.134/31  -- PCCW peering
+134 1H IN PTR   xe-2-0-2.cr1-eqsin.wikimedia.org.
+; 135 1H IN PTR   PCCW TBD.
+
 ; 103.102.166.160/27 (160-191) - unused
 ; 103.102.166.192/27 (192-223) - unused
 ; 103.102.166.224/27 (224-255) - LVS Service IPs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3c0c0c9c43b9ee681caeaa98eff83f931600d8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add my new key

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404604 )

Change subject: Add my new key
..


Add my new key

I'm back from travels.
I've confirmed my identity in person with Arzhel.

Change-Id: I59d5e333e82373e95998e146aeabf604eb9c807a
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 6142ba7..ac2027c 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1047,7 +1047,7 @@
 gid: 500
 name: maxsem
 realname: Max Semenik
-ssh_keys: []
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDfuBTpiiDX2o68s2Lyc2LDT1r39IN3V4bzPVsdZEcJKcti9chfO2BK1xUGZ+KWbUSvQn8TtT0MDTTDDlXEK/oc+MlNn5o+K/xY6lUkyQuWLHZi8GaOuLaqude9myv+u+RGvuvTvre2bVNwAZ94XpSa5gN9BUdrZHeeLGw1NxE9g+675mRxg/2nBM7sPYr7S9MFTxNuW9HUfyXoGx0NZrsTR7gLz0H4ET6HYgLMXVVKIaNLyKkfDdJ/ywmd61LGdp+jUjWjPeClrhutyk/3z//fauC/S1OtyD1IP29Eg3wJbxWaWRnanAq5EueEopz2lOProwOVPnwTYNLk2GRa/xiV
 mseme...@maxsem.corp.wikimedia.org]
 uid: 1220
 email: mseme...@wikimedia.org
   mattflaschen:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59d5e333e82373e95998e146aeabf604eb9c807a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Postgres: remove hardcoded version

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404516 )

Change subject: Postgres: remove hardcoded version
..

Postgres: remove hardcoded version

Bug: T184634
Change-Id: I9f886840faf3bf853e758973d86369a670e19b9d
---
M modules/role/manifests/postgres/common.pp
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/404516/1

diff --git a/modules/role/manifests/postgres/common.pp 
b/modules/role/manifests/postgres/common.pp
index a63af07..d1926f4 100644
--- a/modules/role/manifests/postgres/common.pp
+++ b/modules/role/manifests/postgres/common.pp
@@ -3,7 +3,13 @@
 
 $root_dir = '/srv/postgres'
 
-file { '/etc/postgresql/9.4/main/tuning.conf':
+$pgversion = $::lsbdistcodename ? {
+'stretch' => '9.6',
+'jessie'  => '9.4',
+'trusty'  => '9.3',
+}
+
+file { "/etc/postgresql/${pgversion}/main/tuning.conf":
 ensure => 'present',
 owner  => 'root',
 group  => 'root',
@@ -25,4 +31,3 @@
 srange => '$LABS_NETWORKS',
 }
 }
-

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Netbox: remove tunning.conf include; PGSQL fix 9.6 deprecate...

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404504 )

Change subject: Netbox: remove tunning.conf include; PGSQL fix 9.6 deprecated 
option
..


Netbox: remove tunning.conf include; PGSQL fix 9.6 deprecated option

Bug: T184634
Change-Id: I339463287a9d697cfdd6bf087493132ad4056556
---
M modules/postgresql/templates/master.conf.erb
M modules/profile/manifests/netbox.pp
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ayounsi: Looks good to me, approved
  Zoranzoki21: Looks good to me, but someone else must approve
  Volans: Looks good to me, but someone else must approve



diff --git a/modules/postgresql/templates/master.conf.erb 
b/modules/postgresql/templates/master.conf.erb
index 43a0985..7b56948 100644
--- a/modules/postgresql/templates/master.conf.erb
+++ b/modules/postgresql/templates/master.conf.erb
@@ -1,5 +1,7 @@
 # replication master
 wal_level = hot_standby
 max_wal_senders = <%= @max_wal_senders %>
+<% if @pgversion.to_f < 9.6 %>
 checkpoint_segments = <%= @checkpoint_segments %>
+<% end %>
 wal_keep_segments = <%= @wal_keep_segments %>
diff --git a/modules/profile/manifests/netbox.pp 
b/modules/profile/manifests/netbox.pp
index 244d5a2..90b659f 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -41,7 +41,6 @@
   # We do this for the require in postgres::db
   $require_class = 'postgresql::master'
   class { '::postgresql::master':
-  includes => ['tuning.conf'],
   root_dir => '/srv/postgres',
   use_ssl  => true,
   }
@@ -49,7 +48,6 @@
   } else {
   $require_class = 'postgresql::slave'
   class { '::postgresql::slave':
-  includes => ['tuning.conf'],
   master_server=> $master,
   root_dir => '/srv/postgres',
   replication_pass => $replication_pass,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I339463287a9d697cfdd6bf087493132ad4056556
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Netbox: remove tunning.conf include; PGSQL fix 9.6 deprecate...

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404504 )

Change subject: Netbox: remove tunning.conf include; PGSQL fix 9.6 deprecated 
option
..

Netbox: remove tunning.conf include; PGSQL fix 9.6 deprecated option

Bug: T184634
Change-Id: I339463287a9d697cfdd6bf087493132ad4056556
---
M modules/postgresql/templates/master.conf.erb
M modules/profile/manifests/netbox.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/404504/1

diff --git a/modules/postgresql/templates/master.conf.erb 
b/modules/postgresql/templates/master.conf.erb
index 43a0985..7b56948 100644
--- a/modules/postgresql/templates/master.conf.erb
+++ b/modules/postgresql/templates/master.conf.erb
@@ -1,5 +1,7 @@
 # replication master
 wal_level = hot_standby
 max_wal_senders = <%= @max_wal_senders %>
+<% if @pgversion.to_f < 9.6 %>
 checkpoint_segments = <%= @checkpoint_segments %>
+<% end %>
 wal_keep_segments = <%= @wal_keep_segments %>
diff --git a/modules/profile/manifests/netbox.pp 
b/modules/profile/manifests/netbox.pp
index 244d5a2..90b659f 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -41,7 +41,6 @@
   # We do this for the require in postgres::db
   $require_class = 'postgresql::master'
   class { '::postgresql::master':
-  includes => ['tuning.conf'],
   root_dir => '/srv/postgres',
   use_ssl  => true,
   }
@@ -49,7 +48,6 @@
   } else {
   $require_class = 'postgresql::slave'
   class { '::postgresql::slave':
-  includes => ['tuning.conf'],
   master_server=> $master,
   root_dir => '/srv/postgres',
   replication_pass => $replication_pass,

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: fix issue where service ircbot is declared twice

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399230 )

Change subject: LibreNMS: fix issue where service ircbot is declared twice
..


LibreNMS: fix issue where service ircbot is declared twice

Change-Id: I57c311dee1bc1b70718e07b9f581269b139f7090
---
M modules/librenms/manifests/init.pp
1 file changed, 1 insertion(+), 10 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index ba6b337..0675f78 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -117,24 +117,15 @@
 
 if $active_server == $::fqdn {
 $cron_ensure = 'present'
-$ircbot_ensure = 'running'
 } else {
 $cron_ensure = 'absent'
-$ircbot_ensure = 'stopped'
 }
 
 systemd::service { 'librenms-ircbot':
-ensure  => 'present',
+ensure  => $cron_ensure,
 content => 
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
 require => [File["${install_dir}/config.php"] ],
 }
-
-service { 'librenms-ircbot':
-ensure  => $ircbot_ensure,
-enable  => true,
-require => Systemd::Service['librenms-ircbot'],
-}
-
 
 cron { 'librenms-discovery-all':
 ensure  => $cron_ensure,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57c311dee1bc1b70718e07b9f581269b139f7090
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: fix issue where service ircbot is declared twice

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399230 )

Change subject: LibreNMS: fix issue where service ircbot is declared twice
..

LibreNMS: fix issue where service ircbot is declared twice

Change-Id: I57c311dee1bc1b70718e07b9f581269b139f7090
---
M modules/librenms/manifests/init.pp
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/399230/1

diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index ba6b337..0675f78 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -117,24 +117,15 @@
 
 if $active_server == $::fqdn {
 $cron_ensure = 'present'
-$ircbot_ensure = 'running'
 } else {
 $cron_ensure = 'absent'
-$ircbot_ensure = 'stopped'
 }
 
 systemd::service { 'librenms-ircbot':
-ensure  => 'present',
+ensure  => $cron_ensure,
 content => 
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
 require => [File["${install_dir}/config.php"] ],
 }
-
-service { 'librenms-ircbot':
-ensure  => $ircbot_ensure,
-enable  => true,
-require => Systemd::Service['librenms-ircbot'],
-}
-
 
 cron { 'librenms-discovery-all':
 ensure  => $cron_ensure,

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: Allow librenms to write file in $install_dir

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399101 )

Change subject: LibreNMS: Allow librenms to write file in $install_dir
..

LibreNMS: Allow librenms to write file in $install_dir

The librenms user needs to write files such as sockets or lock files in
the root $install_dir.
As $install_dir is owned by deploy-librenms, this CR adds librenms to
the deploy-librenms group, then ensure that group can write to the
folder.

Change-Id: I16165153cbcdc22078a2240f455ad609dfe0c329
---
M modules/role/manifests/librenms.pp
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/399101/1

diff --git a/modules/role/manifests/librenms.pp 
b/modules/role/manifests/librenms.pp
index 08dbec4..817ccc2 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -23,6 +23,20 @@
 before  => Class['::librenms'],
 }
 
+# The following is required as librenms needs to write files (lock, socket)
+# In $install_dir.
+exec { 'Ensure user librenms is is group deploy-librenms':
+unless  => '/bin/grep -q "deploy-librenms\\S*librenms" /etc/group',
+command => '/usr/sbin/usermod -aG deploy-librenms librenms',
+require => [ User['librenms']
+Scap::Target['librenms/librenms']],
+}
+file { $install_dir:
+mode=> 'g+w',
+require => Scap::Target['librenms/librenms'],
+}
+
+
 $config = {
 'title_image'  => 
'//upload.wikimedia.org/wikipedia/commons/thumb/0/0c/Wikimedia_Foundation_logo_-_horizontal_%282012-2016%29.svg/140px-Wikimedia_Foundation_logo_-_horizontal_%282012-2016%29.svg.png',
 

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibrenNMS IRC bot, config typo

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398940 )

Change subject: LibrenNMS IRC bot, config typo
..


LibrenNMS IRC bot, config typo

Change-Id: Ida424197244457fe7cd98fb2d2ae385d118de5db
---
M modules/librenms/templates/config.php.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/librenms/templates/config.php.erb 
b/modules/librenms/templates/config.php.erb
index db786ef..d005025 100644
--- a/modules/librenms/templates/config.php.erb
+++ b/modules/librenms/templates/config.php.erb
@@ -18,7 +18,7 @@
 
 # Workaround a bug where the puppet array value '+6697' is converted to "6697"
 # The plus is necessary to use TLS
-$config['irc_port'] = "+6697"
+$config['irc_port'] = "+6697";
 
 $puppet_config = <%= scope.function_phpdump([@config]) %>;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida424197244457fe7cd98fb2d2ae385d118de5db
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibrenNMS IRC bot, config typo

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398940 )

Change subject: LibrenNMS IRC bot, config typo
..

LibrenNMS IRC bot, config typo

Change-Id: Ida424197244457fe7cd98fb2d2ae385d118de5db
---
M modules/librenms/templates/config.php.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/398940/1

diff --git a/modules/librenms/templates/config.php.erb 
b/modules/librenms/templates/config.php.erb
index db786ef..d005025 100644
--- a/modules/librenms/templates/config.php.erb
+++ b/modules/librenms/templates/config.php.erb
@@ -18,7 +18,7 @@
 
 # Workaround a bug where the puppet array value '+6697' is converted to "6697"
 # The plus is necessary to use TLS
-$config['irc_port'] = "+6697"
+$config['irc_port'] = "+6697";
 
 $puppet_config = <%= scope.function_phpdump([@config]) %>;
 

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: IRCbot puppet fixes

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398922 )

Change subject: LibreNMS: IRCbot puppet fixes
..


LibreNMS: IRCbot puppet fixes

Change-Id: Icfff49b0477a1e211857f4fcb6760afc46d4d0e8
---
M modules/librenms/manifests/init.pp
1 file changed, 9 insertions(+), 2 deletions(-)

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



diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index 9e3c60e..ba6b337 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -50,7 +50,7 @@
 mode=> '0440',
 content => template('librenms/config.php.erb'),
 require => Group['librenms'],
-notify  => Systemd::Service['librenms-ircbot'],
+notify  => Service['librenms-ircbot'],
 }
 
 file { $rrd_dir:
@@ -124,11 +124,18 @@
 }
 
 systemd::service { 'librenms-ircbot':
-ensure  => $ircbot_ensure,
+ensure  => 'present',
 content => 
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
 require => [File["${install_dir}/config.php"] ],
 }
 
+service { 'librenms-ircbot':
+ensure  => $ircbot_ensure,
+enable  => true,
+require => Systemd::Service['librenms-ircbot'],
+}
+
+
 cron { 'librenms-discovery-all':
 ensure  => $cron_ensure,
 user=> 'librenms',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfff49b0477a1e211857f4fcb6760afc46d4d0e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: IRCbot puppet fixes

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398922 )

Change subject: LibreNMS: IRCbot puppet fixes
..

LibreNMS: IRCbot puppet fixes

Change-Id: Icfff49b0477a1e211857f4fcb6760afc46d4d0e8
---
M modules/librenms/manifests/init.pp
1 file changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/398922/1

diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index 9e3c60e..ba6b337 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -50,7 +50,7 @@
 mode=> '0440',
 content => template('librenms/config.php.erb'),
 require => Group['librenms'],
-notify  => Systemd::Service['librenms-ircbot'],
+notify  => Service['librenms-ircbot'],
 }
 
 file { $rrd_dir:
@@ -124,11 +124,18 @@
 }
 
 systemd::service { 'librenms-ircbot':
-ensure  => $ircbot_ensure,
+ensure  => 'present',
 content => 
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
 require => [File["${install_dir}/config.php"] ],
 }
 
+service { 'librenms-ircbot':
+ensure  => $ircbot_ensure,
+enable  => true,
+require => Systemd::Service['librenms-ircbot'],
+}
+
+
 cron { 'librenms-discovery-all':
 ensure  => $cron_ensure,
 user=> 'librenms',

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: Add an IRCbot process

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398898 )

Change subject: LibreNMS: Add an IRCbot process
..


LibreNMS: Add an IRCbot process

Change-Id: I867cc13a08a3d58fa9fb303f6a3cb93a4bf15d28
---
M modules/librenms/manifests/init.pp
M modules/librenms/templates/config.php.erb
A modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
M modules/role/manifests/librenms.pp
4 files changed, 26 insertions(+), 3 deletions(-)

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



diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index 1068252..9e3c60e 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -50,6 +50,7 @@
 mode=> '0440',
 content => template('librenms/config.php.erb'),
 require => Group['librenms'],
+notify  => Systemd::Service['librenms-ircbot'],
 }
 
 file { $rrd_dir:
@@ -116,8 +117,16 @@
 
 if $active_server == $::fqdn {
 $cron_ensure = 'present'
+$ircbot_ensure = 'running'
 } else {
 $cron_ensure = 'absent'
+$ircbot_ensure = 'stopped'
+}
+
+systemd::service { 'librenms-ircbot':
+ensure  => $ircbot_ensure,
+content => 
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
+require => [File["${install_dir}/config.php"] ],
 }
 
 cron { 'librenms-discovery-all':
diff --git a/modules/librenms/templates/config.php.erb 
b/modules/librenms/templates/config.php.erb
index 3705187..db786ef 100644
--- a/modules/librenms/templates/config.php.erb
+++ b/modules/librenms/templates/config.php.erb
@@ -16,6 +16,10 @@
 # All types of Junos Alarms that is not "off"/(no alarm)
 $config['alert']['macros']['rule']['junos_alarm'] = '%sensors.sensor_class = 
"state" && %sensors.sensor_type ~ "Jnx.*AlarmState" && %sensors.sensor_current 
!= "2"';
 
+# Workaround a bug where the puppet array value '+6697' is converted to "6697"
+# The plus is necessary to use TLS
+$config['irc_port'] = "+6697"
+
 $puppet_config = <%= scope.function_phpdump([@config]) %>;
 
 $config = array_merge($config, $puppet_config);
diff --git a/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb 
b/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
new file mode 100644
index 000..e0bc2b6
--- /dev/null
+++ b/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
@@ -0,0 +1,11 @@
+[Unit]
+Description=LibreNMS IRCbot
+
+[Service]
+User=librenms
+Group=librenms
+ExecStart=/usr/bin/php /srv/deployment/librenms/librenms/irc.php
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/modules/role/manifests/librenms.pp 
b/modules/role/manifests/librenms.pp
index 7bdcb63..08dbec4 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -41,11 +41,10 @@
 'community' => [ $passwords::network::snmp_ro_community ],
 },
 'irc_host' => 'irc.freenode.org',
-'irc_port' => '+6697',
-'irc_chan' => '#wikimedia-netops',
+'irc_chan' => '#wikimedia-netops-test,#wikimedia-netops',
 'irc_alert'=> true,
 'irc_debug'=> false,
-'irc_alert_chan'   => '#wikimedia-netops',
+'irc_alert_chan'   => '#wikimedia-netops-test',
 'irc_alert_utf8'   => true,
 'irc_nick' => 'librenms-wmf',
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I867cc13a08a3d58fa9fb303f6a3cb93a4bf15d28
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: Add an IRCbot process

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398898 )

Change subject: LibreNMS: Add an IRCbot process
..

LibreNMS: Add an IRCbot process

Change-Id: I867cc13a08a3d58fa9fb303f6a3cb93a4bf15d28
---
M modules/librenms/manifests/init.pp
A modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/398898/1

diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index 1068252..9e3c60e 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -50,6 +50,7 @@
 mode=> '0440',
 content => template('librenms/config.php.erb'),
 require => Group['librenms'],
+notify  => Systemd::Service['librenms-ircbot'],
 }
 
 file { $rrd_dir:
@@ -116,8 +117,16 @@
 
 if $active_server == $::fqdn {
 $cron_ensure = 'present'
+$ircbot_ensure = 'running'
 } else {
 $cron_ensure = 'absent'
+$ircbot_ensure = 'stopped'
+}
+
+systemd::service { 'librenms-ircbot':
+ensure  => $ircbot_ensure,
+content => 
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
+require => [File["${install_dir}/config.php"] ],
 }
 
 cron { 'librenms-discovery-all':
diff --git a/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb 
b/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
new file mode 100644
index 000..e0bc2b6
--- /dev/null
+++ b/modules/librenms/templates/initscripts/librenms-ircbot.systemd.erb
@@ -0,0 +1,11 @@
+[Unit]
+Description=LibreNMS IRCbot
+
+[Service]
+User=librenms
+Group=librenms
+ExecStart=/usr/bin/php /srv/deployment/librenms/librenms/irc.php
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/private[master]: BirdLG: Add fake python secret session key

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398380 )

Change subject: BirdLG: Add fake python secret session key
..


BirdLG: Add fake python secret session key

Change-Id: I3103ad68875ef6f2b38536145f2cbec7b05257c3
---
M modules/passwords/manifests/init.pp
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 136aa7e..584dafa 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -509,3 +509,7 @@
 $secret_key = 'notsecret'
 $replication_password = 'notsecret'
 }
+
+class passwords::birdlg {
+$secret_key = 'notsecret'
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3103ad68875ef6f2b38536145f2cbec7b05257c3
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/private[master]: BirdLG: Add fake python secret session key

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398380 )

Change subject: BirdLG: Add fake python secret session key
..

BirdLG: Add fake python secret session key

Change-Id: I3103ad68875ef6f2b38536145f2cbec7b05257c3
---
M modules/passwords/manifests/init.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/80/398380/1

diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 136aa7e..584dafa 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -509,3 +509,7 @@
 $secret_key = 'notsecret'
 $replication_password = 'notsecret'
 }
+
+class passwords::birdlg {
+$secret_key = 'notsecret'
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3103ad68875ef6f2b38536145f2cbec7b05257c3
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bird anycast: add anycast_healthchecker

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397723 )

Change subject: Bird anycast: add anycast_healthchecker
..

Bird anycast: add anycast_healthchecker

Still a few points to clarify but the most part is there, reviews welcome.

https://github.com/unixsurfer/anycast_healthchecker

To be merged after:
- https://gerrit.wikimedia.org/r/#/c/397615/
- https://gerrit.wikimedia.org/r/#/c/397619/
- Packages moved to the apt repository

Change-Id: Iab13114b8268c48502cd5161629bec72ddc51fdc
---
A modules/bird/manifests/anycast_healthchecker.pp
A modules/bird/manifests/anycast_healthchecker_check.pp
A modules/bird/templates/anycast-healthchecker-check.conf.erb
A modules/bird/templates/anycast-healthchecker.conf.erb
A modules/bird/templates/anycast-healthchecker.service.erb
M modules/bird/templates/bird_anycast.conf.erb
M modules/profile/manifests/bird/anycast.pp
7 files changed, 166 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/397723/1

diff --git a/modules/bird/manifests/anycast_healthchecker.pp 
b/modules/bird/manifests/anycast_healthchecker.pp
new file mode 100644
index 000..53b6c02
--- /dev/null
+++ b/modules/bird/manifests/anycast_healthchecker.pp
@@ -0,0 +1,64 @@
+# == Class: bird::anycast_healthchecker
+#
+# Install and configure the base of anycast_healthchecker
+# https://github.com/unixsurfer/anycast_healthchecker
+#
+# - Global configuration file
+# - pid directory
+# - Services checks directory
+# - Log directory
+# - systemd service
+#
+# The actual services checks are configured with 
bird::anycast_healthchecker_check
+#
+#
+class bird::anycast_healthchecker(){
+
+  require_package('python-anycast-healthchecker')
+
+  file { '/etc/anycast-healthchecker.conf':
+  ensure  => present,
+  owner   => 'bird',
+  group   => 'bird',
+  mode=> '0664',
+  content => template('bird/anycast-healthchecker.conf.erb'),
+  }
+
+  file {'/var/run/anycast-healthchecker/':
+  ensure => directory,
+  owner  => 'bird',
+  group  => 'bird',
+  mode   => '0775',
+  }
+
+  file {'/etc/anycast-healthchecker.d/':
+  ensure => directory,
+  owner  => 'bird',
+  group  => 'bird',
+  mode   => '0775',
+  }
+
+  file {'/var/log/anycast-healthchecker/':
+  ensure => directory,
+  owner  => 'bird',
+  group  => 'bird',
+  mode   => '0775',
+  }
+
+  systemd::service { 'anycast-healthchecker':
+  ensure  => present,
+  content => template('bird/anycast-healthchecker.service.erb'),
+  require => [File['/etc/anycast-healthchecker.conf'],
+  File['/var/run/anycast-healthchecker/'],
+  File['/var/log/anycast-healthchecker/'],
+  File['/etc/anycast-healthchecker.d/'], ],
+  }
+
+  service { 'anycast-healthchecker':
+  ensure  => running,
+  enable  => true,
+  require => [Package['python-anycast-healthchecker'],
+  Systemd::Service['anycast-healthchecker'] ],
+  }
+
+}
diff --git a/modules/bird/manifests/anycast_healthchecker_check.pp 
b/modules/bird/manifests/anycast_healthchecker_check.pp
new file mode 100644
index 000..05d215f
--- /dev/null
+++ b/modules/bird/manifests/anycast_healthchecker_check.pp
@@ -0,0 +1,30 @@
+# == Class: bird::anycast_healthchecker_check
+#
+# Add service health check for anycast_healthchecker
+#
+# === Parameters
+#
+# [*ensure*]
+#  Standard file ensure
+#
+# [*anycast_vip*]
+#  The VIP being monitored with this check
+#
+# [*check_cmd*]
+#  The full health check command for this VIP
+#
+class bird::anycast_healthchecker_check(
+  $ensure,
+  $anycast_vip,
+  $check_cmd,
+  ){
+
+  file { "/etc/anycast-healthchecker.d/${title}.conf":
+  ensure  => $ensure,
+  owner   => 'bird',
+  group   => 'bird',
+  mode=> '0664',
+  content => template('bird/anycast-healthchecker-check.conf.erb'),
+  notify  => Service['anycast-healthchecker'],
+  }
+}
diff --git a/modules/bird/templates/anycast-healthchecker-check.conf.erb 
b/modules/bird/templates/anycast-healthchecker-check.conf.erb
new file mode 100644
index 000..4ba5445
--- /dev/null
+++ b/modules/bird/templates/anycast-healthchecker-check.conf.erb
@@ -0,0 +1,9 @@
+[<%= @title %>]
+check_cmd = <%= @check_cmd %>
+check_interval= 1
+check_timeout = 1
+check_fail= 1
+check_rise= 10
+check_disabled= false
+on_disabled   = withdraw
+ip_prefix = <%= @anycast_vip %>/32
diff --git a/modules/bird/templates/anycast-healthchecker.conf.erb 
b/modules/bird/templates/anycast-healthchecker.conf.erb
new file mode 100644
index 000..7a2682d
--- /dev/null
+++ b/modules/bird/templates/anycast-healthchecker.conf.erb
@@ -0,0 +1,27 @@
+[DEFAULT]
+interface= lo
+
+[daemon]
+pidfile= 
/var/run/anycast-healthchecker/anycast-healthchecker.pid
+ipv4 

[MediaWiki-commits] [Gerrit] operations...python-anycast-healthchecker[master]: Initial deb packaging

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397619 )

Change subject: Initial deb packaging
..

Initial deb packaging

Change-Id: I2218723442c52e5498e4623720d72ac5936b3b4c
---
A debian/changelog
A debian/compat
A debian/control
A debian/rules
A debian/source/format
A debian/watch
6 files changed, 29 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/python-anycast-healthchecker 
refs/changes/19/397619/1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..447e37c
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+anycast-healthchecker (0.8.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Arzhel Younsi   Fri, 01 Dec 2017 10:42:04 -0800
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..c466b8e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: anycast-healthchecker
+Maintainer: Arzhel Younsi 
+Section: python
+Priority: optional
+Build-Depends: dh-python, python-setuptools (>= 0.6b3), python-all (>= 
2.6.6-3), debhelper (>= 8), python3 (>= 3)
+Standards-Version: 3.9.3
+Homepage: https://github.com/unixsurfer/anycast_healthchecker
+
+Package: python-anycast-healthchecker
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}, bird, python-json-logger
+Description: A healthchecker for Anycasted Services
+ False
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..65ff3a5
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=anycast-healthchecker
+%:
+   dh $@ --with python3 --buildsystem=pybuild
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..0dda51d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+# please also check http://pypi.debian.net/anycast-healthchecker/watch
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/anycast-healthchecker/anycast-healthchecker-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2218723442c52e5498e4623720d72ac5936b3b4c
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/python-anycast-healthchecker
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...python-json-logger[master]: Initial deb packaging

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397615 )

Change subject: Initial deb packaging
..

Initial deb packaging

Change-Id: I6957821812a44d2e1ce31be7e75347cf0b487f8b
---
A debian/changelog
A debian/compat
A debian/control
A debian/rules
A debian/source/format
A debian/watch
6 files changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-json-logger 
refs/changes/15/397615/1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..ef755be
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+python-json-logger (0.1.8-1) unstable; urgency=low
+
+  * Initial release
+
+ -- arzhel Younsi   Thu, 30 Nov 2017 16:03:00 -0800
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..20606b5
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,12 @@
+Source: python-json-logger
+Maintainer: Arzhel Younsi 
+Section: python
+Priority: optional
+Build-Depends: dh-python, python-setuptools (>= 0.6b3), python-all (>= 
2.6.6-3), debhelper (>= 8), python3 (>= 3)
+Standards-Version: 3.9.3
+Homepage: http://github.com/madzak/python-json-logger
+
+Package: python-json-logger
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: A python library adding a json log formatter
diff --git a/debian/rules b/debian/rules
new file mode 100644
index 000..2ce82a4
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=python-json-logger
+%:
+   dh $@ --with python3 --buildsystem=pybuild
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..085ba90
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+# please also check http://pypi.debian.net/python-json-logger/watch
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/python-json-logger/python-json-logger-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6957821812a44d2e1ce31be7e75347cf0b487f8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/python-json-logger
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Add eqsin networking

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395174 )

Change subject: DNS: Add eqsin networking
..


DNS: Add eqsin networking

Change-Id: I2175427928bf1cf5d57dad7aacbfaa32b29d4da6
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 27 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 884149b..65e4e65 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -68,3 +68,5 @@
 
 ; 2001:df2:e500:::/56 - Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   mr1-eqsin.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   cr1-eqsin.wikimedia.org.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index a6e6e4f..23af591 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2937,6 +2937,11 @@
 
 ; 10.132.128.0/17 - eqsin mgmt
 $ORIGIN 128.132.{{ zonename }}.
+1   1H  IN PTR  mr1-eqsin.mgmt.eqsin.wmnet.
+2   1H  IN PTR  cr1-eqsin.mgmt.eqsin.wmnet.
+4   1H  IN PTR  asw-eqsin.mgmt.eqsin.wmnet.
+5   1H  IN PTR  scs-eqsin.mgmt.eqsin.wmnet.
+
 $ORIGIN 129.132.{{ zonename }}.
 7   1H  IN PTR  bast5001.mgmt.eqsin.wmnet.
 8   1H  IN PTR  dns5001.mgmt.eqsin.wmnet.
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index fdba2c0..5b4b585 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -29,6 +29,15 @@
 ; 103.102.166.32/27 (32-63) - unused
 ; 103.102.166.64/26 (64-127) - unused
 ; 103.102.166.128/27 (128-159) - Infrastructure Space
+
+; 103.102.166.128/30 (128-131) - Router's loopbacks
+128 1H IN PTR   mr1-eqsin.wikimedia.org.
+129 1H IN PTR   cr1-eqsin.wikimedia.org.
+
+; 103.102.166.132/31 -- cr1-eqsin <--> mr1-eqsin
+132 1H IN PTR   ae1-401.cr1-eqsin.wikimedia.org.
+133 1H IN PTR   ge-0-0-4-401.mr1-eqsin.wikimedia.org.
+
 ; 103.102.166.160/27 (160-191) - unused
 ; 103.102.166.192/27 (192-223) - unused
 ; 103.102.166.224/27 (224-255) - LVS Service IPs
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 97a0a50..5fab07a 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -462,6 +462,12 @@
 mr1-ulsfo.oob   1H  IN A209.237.234.242
 mr1-ulsfo.oob   1H  IN  2607:f3a0:0:1024::2
 
+cr1-eqsin   1H  IN A103.102.166.129
+1H  IN  2001:df2:e500:::2
+mr1-eqsin   1H  IN A103.102.166.128
+1H  IN  2001:df2:e500:::1
+mr1-eqsin.oob   1H  IN A27.111.227.106
+mr1-eqsin.oob   1H  IN  2403:b100:3001:9::2
 
 vl1001-eth1.lvs1004 1H  IN A208.80.154.58
 vl1001-eth1.lvs1005 1H  IN A208.80.154.59
diff --git a/templates/wmnet b/templates/wmnet
index 57796e1..25b382d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4695,6 +4695,11 @@
 
 $ORIGIN mgmt.eqsin.wmnet.
 
+mr1-eqsin   1H  IN A10.132.128.1
+cr1-eqsin   1H  IN A10.132.128.2
+asw-eqsin   1H  IN A10.132.128.4
+scs-eqsin   1H  IN A10.132.128.5
+
 ; Servers listed sequentially
 bast50011H  IN A10.132.129.7
 dns5001 1H  IN A10.132.129.8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2175427928bf1cf5d57dad7aacbfaa32b29d4da6
Gerrit-PatchSet: 5
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Add eqsin networking

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395174 )

Change subject: DNS: Add eqsin networking
..

DNS: Add eqsin networking

Change-Id: I2175427928bf1cf5d57dad7aacbfaa32b29d4da6
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/74/395174/1

diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 884149b..fedc737 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -68,3 +68,5 @@
 
 ; 2001:df2:e500:::/56 - Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   mr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   cr1-eqsin.wikimedia.org.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index a6e6e4f..23af591 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2937,6 +2937,11 @@
 
 ; 10.132.128.0/17 - eqsin mgmt
 $ORIGIN 128.132.{{ zonename }}.
+1   1H  IN PTR  mr1-eqsin.mgmt.eqsin.wmnet.
+2   1H  IN PTR  cr1-eqsin.mgmt.eqsin.wmnet.
+4   1H  IN PTR  asw-eqsin.mgmt.eqsin.wmnet.
+5   1H  IN PTR  scs-eqsin.mgmt.eqsin.wmnet.
+
 $ORIGIN 129.132.{{ zonename }}.
 7   1H  IN PTR  bast5001.mgmt.eqsin.wmnet.
 8   1H  IN PTR  dns5001.mgmt.eqsin.wmnet.
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index fdba2c0..e4224fd 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -29,6 +29,15 @@
 ; 103.102.166.32/27 (32-63) - unused
 ; 103.102.166.64/26 (64-127) - unused
 ; 103.102.166.128/27 (128-159) - Infrastructure Space
+
+: 103.102.166.128/30 (138-131) - Router's loopbacks
+128 1H IN PTR   mr1-eqsin.wikimedia.org.
+129 1H IN PTR   cr1-eqsin.wikimedia.org.
+
+; 103.102.166.132/31 -- cr1-eqsin <--> mr1-eqsin
+132 1H IN PTR   ae1-401.cr1-eqsin.wikimedia.org.
+133 1H IN PTR   ge-0-0-4-401.mr1-eqsin.wikimedia.org.
+
 ; 103.102.166.160/27 (160-191) - unused
 ; 103.102.166.192/27 (192-223) - unused
 ; 103.102.166.224/27 (224-255) - LVS Service IPs
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 40070fc..e5281fb 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -462,6 +462,12 @@
 mr1-ulsfo.oob   1H  IN A209.237.234.242
 mr1-ulsfo.oob   1H  IN  2607:f3a0:0:1024::2
 
+cr1-eqsin   1H  IN A103.102.166.129
+1H  IN  2001:df2:e500:::2
+mr1-eqsin   1H  IN A103.102.166.128
+1H  IN  2001:df2:e500:::1
+mr1-eqsin.oob   1H  IN A27.111.227.106
+mr1-eqsin.oob   1H  IN  2403:b100:3001:9::2
 
 vl1001-eth1.lvs1004 1H  IN A208.80.154.58
 vl1001-eth1.lvs1005 1H  IN A208.80.154.59
diff --git a/templates/wmnet b/templates/wmnet
index fed46aa..ba248e3 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4695,6 +4695,11 @@
 
 $ORIGIN mgmt.eqsin.wmnet.
 
+mr1-eqsin   1H  IN A10.132.128.1
+cr1-eqsin   1H  IN A10.132.128.2
+asw-eqsin   1H  IN A10.132.128.4
+scs-eqsin   1H  IN A10.132.128.5
+
 ; Servers listed sequentially
 bast50011H  IN A10.132.129.7
 dns5001 1H  IN A10.132.129.8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2175427928bf1cf5d57dad7aacbfaa32b29d4da6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...python-json-logger[master]: Initial deb packaging

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394507 )

Change subject: Initial deb packaging
..

Initial deb packaging

Change-Id: I1386a55485d8ea776679851a32f403de0a191135
---
A debian/changelog
A debian/compat
A debian/control
A debian/rules
A debian/source/format
A debian/watch
6 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-json-logger 
refs/changes/07/394507/1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..ef755be
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+python-json-logger (0.1.8-1) unstable; urgency=low
+
+  * Initial release
+
+ -- arzhel Younsi   Thu, 30 Nov 2017 16:03:00 -0800
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..a132cdb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: python-json-logger
+Maintainer: Arzhel Younsi 
+Section: python
+Priority: optional
+Build-Depends: dh-python, python-setuptools (>= 0.6b3), python-all (>= 
2.6.6-3), debhelper (>= 8), python (>= 2.6.6-3~)
+Standards-Version: 3.9.3
+Homepage: http://github.com/madzak/python-json-logger
+
+Package: python-json-logger
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Description: A python library adding a json log formatter
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..a7e6ebb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=python-json-logger
+%:
+   dh $@ --with python2 --buildsystem=pybuild
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..085ba90
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+# please also check http://pypi.debian.net/python-json-logger/watch
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/python-json-logger/python-json-logger-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1386a55485d8ea776679851a32f403de0a191135
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/python-json-logger
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bird: add monitoring to the VIP and bird process

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393668 )

Change subject: Bird: add monitoring to the VIP and bird process
..


Bird: add monitoring to the VIP and bird process

Bug: T98006
Change-Id: I84696ba659cea3a402d825be17c9c893c2ffdee1
---
M modules/bird/manifests/init.pp
A modules/profile/manifests/bird/anycast_monitoring.pp
M modules/role/manifests/icinga.pp
3 files changed, 26 insertions(+), 0 deletions(-)

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



diff --git a/modules/bird/manifests/init.pp b/modules/bird/manifests/init.pp
index 79c007a..ca42920 100644
--- a/modules/bird/manifests/init.pp
+++ b/modules/bird/manifests/init.pp
@@ -72,4 +72,9 @@
   notify  => Service['bird'],
   }
 
+  nrpe::monitor_service { 'bird':
+  ensure   => present,
+  description  => 'Bird Internet Routing Daemon',
+  nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:2 -C bird',
+  }
 }
diff --git a/modules/profile/manifests/bird/anycast_monitoring.pp 
b/modules/profile/manifests/bird/anycast_monitoring.pp
new file mode 100644
index 000..7c756a7
--- /dev/null
+++ b/modules/profile/manifests/bird/anycast_monitoring.pp
@@ -0,0 +1,20 @@
+# Define monitoring for all Anycast VIPs
+# By their nature, those VIPs are advertized from several locations on the
+# network. In its current state, Icinga can only alert if that IP is nowhere
+# to be seen on the network. Not if the number of hosts advertizing that VIP
+# falls under a certain threshold.
+# The service check will only check the health of the server closest to Icinga
+# in term of BGP distance (or multiple servers if load-balancing is enabled).
+
+class profile::bird::anycast_monitoring{
+
+monitoring::host { 'recdns.anycast.wmnet':
+host_fqdn => 'recdns.anycast.wmnet',
+}
+
+monitoring::service { 'Recursive DNS anycast VIP':
+host  => 'recdns.anycast.wmnet',
+description   => 'recursive DNS anycast VIP',
+check_command => 'check_dns!www.wikipedia.org',
+}
+}
diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp
index 714c09a..9b0b87d 100644
--- a/modules/role/manifests/icinga.pp
+++ b/modules/role/manifests/icinga.pp
@@ -34,6 +34,7 @@
 include icinga::monitor::services
 include icinga::monitor::reading_web
 include icinga::event_handlers::raid
+include ::profile::bird::anycast_monitoring
 
 $monitoring_groups = hiera('monitoring::groups')
 create_resources(monitoring::group, $monitoring_groups)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84696ba659cea3a402d825be17c9c893c2ffdee1
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bird: add monitoring to the VIP and bird process

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393668 )

Change subject: Bird: add monitoring to the VIP and bird process
..

Bird: add monitoring to the VIP and bird process

Bug: T98006
Change-Id: I84696ba659cea3a402d825be17c9c893c2ffdee1
---
M modules/bird/manifests/init.pp
A modules/profile/manifests/bird/anycast_monitoring.pp
M modules/role/manifests/icinga.pp
3 files changed, 26 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/393668/1

diff --git a/modules/bird/manifests/init.pp b/modules/bird/manifests/init.pp
index 79c007a..84009ad 100644
--- a/modules/bird/manifests/init.pp
+++ b/modules/bird/manifests/init.pp
@@ -72,4 +72,9 @@
   notify  => Service['bird'],
   }
 
+  nrpe::monitor_service { 'bird':
+  ensure   => present,
+  description  => 'Bird Internet Routing Daemon',
+  nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -C bird',
+  }
 }
diff --git a/modules/profile/manifests/bird/anycast_monitoring.pp 
b/modules/profile/manifests/bird/anycast_monitoring.pp
new file mode 100644
index 000..e8596d9
--- /dev/null
+++ b/modules/profile/manifests/bird/anycast_monitoring.pp
@@ -0,0 +1,20 @@
+# Define monitoring for all Anycast VIPs
+# By their nature, those VIPs are advertized from several locations on the
+# network. In its current state, Icinga can only alert if that IP is nowhere
+# to be seen on the network. Not if the number of hosts advertizing that VIP
+# falls under a certain threshold.
+# The service check will only check the health of the server closest to Icinga
+# in term of BGP distance (or multiple servers if load-balancing is enabled).
+
+class profile::bird::anycast_monitoring(
+
+@monitoring::host { 'recdns.anycast.wmnet':
+host_fqdn => 'recdns.anycast.wmnet',
+}
+
+monitoring::service { 'Recursive DNS anycast VIP':
+host  => 'recdns.anycast.wmnet',
+description   => 'recursive DNS anycast VIP',
+check_command => 'check_dns!www.wikipedia.org',
+}
+}
diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp
index 714c09a..9b0b87d 100644
--- a/modules/role/manifests/icinga.pp
+++ b/modules/role/manifests/icinga.pp
@@ -34,6 +34,7 @@
 include icinga::monitor::services
 include icinga::monitor::reading_web
 include icinga::event_handlers::raid
+include ::profile::bird::anycast_monitoring
 
 $monitoring_groups = hiera('monitoring::groups')
 create_resources(monitoring::group, $monitoring_groups)

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bird: use multihop eBGP (peer with router's loopback)

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392742 )

Change subject: Bird: use multihop eBGP (peer with router's loopback)
..

Bird: use multihop eBGP (peer with router's loopback)

Change-Id: Ia82c9a9c8766c6bae57fdeedde29ec4085c56384
---
M modules/bird/templates/bird_anycast.conf.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/392742/1

diff --git a/modules/bird/templates/bird_anycast.conf.erb 
b/modules/bird/templates/bird_anycast.conf.erb
index dc2693d..57c68bc 100644
--- a/modules/bird/templates/bird_anycast.conf.erb
+++ b/modules/bird/templates/bird_anycast.conf.erb
@@ -33,6 +33,7 @@
 <%- @neighbors.each do |neighbor| -%>
 protocol bgp {
 import none;
+multihop 2;
 export filter vips_filter;
 local as 64605;
 neighbor <%= neighbor %> as 14907;

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netbox: rename duplicate Icinga check

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392410 )

Change subject: netbox: rename duplicate Icinga check
..


netbox: rename duplicate Icinga check

Change-Id: I5773eceb6fc5b15f47d8f46f6510e3813d3317df
---
M modules/profile/manifests/netbox.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/netbox.pp 
b/modules/profile/manifests/netbox.pp
index 63be3f7..c62b03a 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -122,7 +122,7 @@
 
   monitoring::service { 'netbox-ssl':
   ensure=> $monitoring_ensure,
-  description   => 'Netbox HTTPS',
+  description   => 'Netbox SSL',
   check_command => 'check_ssl_http_letsencrypt!netbox.wikimedia.org',
   }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5773eceb6fc5b15f47d8f46f6510e3813d3317df
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "DNS: Only send eqsin countries to ulsfo"

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392105 )

Change subject: Revert "DNS: Only send eqsin countries to ulsfo"
..


Revert "DNS: Only send eqsin countries to ulsfo"

This reverts commit 56e7131ffd1e24b35eb7977437cd2ad69c0f3315.

Change-Id: Ifc7a9b15ddf6ef4f1e533ea61f9647b7d07ec7b3
---
M geo-maps
1 file changed, 27 insertions(+), 27 deletions(-)

Approvals:
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Ayounsi: Looks good to me, approved



diff --git a/geo-maps b/geo-maps
index b07bdeb..d256477 100644
--- a/geo-maps
+++ b/geo-maps
@@ -23,8 +23,8 @@
 HK => [ulsfo, codfw, eqiad, esams, eqsin], # Hong Kong
 ID => [ulsfo, codfw, eqiad, esams, eqsin], # Indonesia
 IL => [esams, eqiad, codfw, ulsfo, eqsin], # Israel
-IN => [ulsfo, esams, eqiad, codfw, eqsin], # India
-IO => [ulsfo, esams, eqiad, codfw, eqsin], # British Indian Ocean 
Territory
+IN => [esams, eqiad, codfw, ulsfo, eqsin], # India
+IO => [esams, eqiad, codfw, ulsfo, eqsin], # British Indian Ocean 
Territory
 IQ => [esams, eqiad, codfw, ulsfo, eqsin], # Iraq
 IR => [esams, eqiad, codfw, ulsfo, eqsin], # Iran (Islamic 
Republic of)
 JO => [esams, eqiad, codfw, ulsfo, eqsin], # Jordan
@@ -37,7 +37,7 @@
 KZ => [esams, eqiad, codfw, ulsfo, eqsin], # Kazakhstan
 LA => [ulsfo, codfw, eqiad, esams, eqsin], # Lao People's 
Democratic Republic
 LB => [esams, eqiad, codfw, ulsfo, eqsin], # Lebanon
-LK => [ulsfo, esams, eqiad, codfw, eqsin], # Sri Lanka
+LK => [esams, eqiad, codfw, ulsfo, eqsin], # Sri Lanka
 MM => [ulsfo, codfw, eqiad, esams, eqsin], # Myanmar
 MN => [ulsfo, codfw, eqiad, esams, eqsin], # Mongolia
 MO => [ulsfo, codfw, eqiad, esams, eqsin], # Macao
@@ -46,7 +46,7 @@
 NP => [ulsfo, codfw, eqiad, esams, eqsin], # Nepal
 OM => [esams, eqiad, codfw, ulsfo, eqsin], # Oman
 PH => [ulsfo, codfw, eqiad, esams, eqsin], # Philippines
-PK => [ulsfo, esams, eqiad, codfw, eqsin], # Pakistan
+PK => [esams, eqiad, codfw, ulsfo, eqsin], # Pakistan
 PS => [esams, eqiad, codfw, ulsfo, eqsin], # Palestine, State of
 QA => [esams, eqiad, codfw, ulsfo, eqsin], # Qatar
 SA => [esams, eqiad, codfw, ulsfo, eqsin], # Saudi Arabia
@@ -119,20 +119,20 @@
 },
 NA => {
 US => { # United States of America
-AK => [codfw, ulsfo, eqiad, esams, eqsin], # Alaska
+AK => [ulsfo, codfw, eqiad, esams, eqsin], # Alaska
 AL => [codfw, eqiad, ulsfo, esams, eqsin], # Alabama
 AR => [codfw, eqiad, ulsfo, esams, eqsin], # Arkansas
-AZ => [codfw, ulsfo, eqiad, esams, eqsin], # Arizona
-CA => [codfw, ulsfo, eqiad, esams, eqsin], # California
+AZ => [ulsfo, codfw, eqiad, esams, eqsin], # Arizona
+CA => [ulsfo, codfw, eqiad, esams, eqsin], # California
 CO => [codfw, eqiad, ulsfo, esams, eqsin], # Colorado
 CT => [eqiad, codfw, ulsfo, esams, eqsin], # Connecticut
 DC => [eqiad, codfw, ulsfo, esams, eqsin], # District of 
Columbia
 DE => [eqiad, codfw, ulsfo, esams, eqsin], # Delaware
 FL => [eqiad, codfw, ulsfo, esams, eqsin], # Florida
 GA => [eqiad, codfw, ulsfo, esams, eqsin], # Georgia
-HI => [codfw, ulsfo, eqiad, esams, eqsin], # Hawaii
+HI => [ulsfo, codfw, eqiad, esams, eqsin], # Hawaii
 IA => [codfw, eqiad, ulsfo, esams, eqsin], # Iowa
-ID => [codfw, ulsfo, eqiad, esams, eqsin], # Idaho
+ID => [ulsfo, codfw, eqiad, esams, eqsin], # Idaho
 IL => [eqiad, codfw, ulsfo, esams, eqsin], # Illinois
 IN => [eqiad, codfw, ulsfo, esams, eqsin], # Indiana
 KS => [codfw, eqiad, ulsfo, esams, eqsin], # Kansas
@@ -145,46 +145,46 @@
 MN => [codfw, eqiad, ulsfo, esams, eqsin], # Minnesota
 MO => [codfw, eqiad, ulsfo, esams, eqsin], # Missouri
 MS => [codfw, eqiad, ulsfo, esams, eqsin], # Mississippi
-MT => [codfw, ulsfo, eqiad, esams, eqsin], # Montana
+MT => [ulsfo, codfw, eqiad, esams, eqsin], # Montana
 NC => [eqiad, codfw, ulsfo, esams, eqsin], # North Carolina
 ND => [codfw, eqiad, ulsfo, esams, eqsin], # North Dakota
 NE => [codfw, eqiad, ulsfo, esams, eqsin], # Nebraska
 NH => [eqiad, codfw, ulsfo, esams, eqsin], # New Hampshire
 NJ => [eqiad, codfw, ulsfo, esams, eqsin], # New Jersey
 

[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "DNS: Only send eqsin countries to ulsfo"

[Ayounsi (Code Review)]

Hello BBlack, jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/392105

to review the following change.


Change subject: Revert "DNS: Only send eqsin countries to ulsfo"
..

Revert "DNS: Only send eqsin countries to ulsfo"

This reverts commit 56e7131ffd1e24b35eb7977437cd2ad69c0f3315.

Change-Id: Ifc7a9b15ddf6ef4f1e533ea61f9647b7d07ec7b3
---
M geo-maps
1 file changed, 27 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/05/392105/1

diff --git a/geo-maps b/geo-maps
index b07bdeb..d256477 100644
--- a/geo-maps
+++ b/geo-maps
@@ -23,8 +23,8 @@
 HK => [ulsfo, codfw, eqiad, esams, eqsin], # Hong Kong
 ID => [ulsfo, codfw, eqiad, esams, eqsin], # Indonesia
 IL => [esams, eqiad, codfw, ulsfo, eqsin], # Israel
-IN => [ulsfo, esams, eqiad, codfw, eqsin], # India
-IO => [ulsfo, esams, eqiad, codfw, eqsin], # British Indian Ocean 
Territory
+IN => [esams, eqiad, codfw, ulsfo, eqsin], # India
+IO => [esams, eqiad, codfw, ulsfo, eqsin], # British Indian Ocean 
Territory
 IQ => [esams, eqiad, codfw, ulsfo, eqsin], # Iraq
 IR => [esams, eqiad, codfw, ulsfo, eqsin], # Iran (Islamic 
Republic of)
 JO => [esams, eqiad, codfw, ulsfo, eqsin], # Jordan
@@ -37,7 +37,7 @@
 KZ => [esams, eqiad, codfw, ulsfo, eqsin], # Kazakhstan
 LA => [ulsfo, codfw, eqiad, esams, eqsin], # Lao People's 
Democratic Republic
 LB => [esams, eqiad, codfw, ulsfo, eqsin], # Lebanon
-LK => [ulsfo, esams, eqiad, codfw, eqsin], # Sri Lanka
+LK => [esams, eqiad, codfw, ulsfo, eqsin], # Sri Lanka
 MM => [ulsfo, codfw, eqiad, esams, eqsin], # Myanmar
 MN => [ulsfo, codfw, eqiad, esams, eqsin], # Mongolia
 MO => [ulsfo, codfw, eqiad, esams, eqsin], # Macao
@@ -46,7 +46,7 @@
 NP => [ulsfo, codfw, eqiad, esams, eqsin], # Nepal
 OM => [esams, eqiad, codfw, ulsfo, eqsin], # Oman
 PH => [ulsfo, codfw, eqiad, esams, eqsin], # Philippines
-PK => [ulsfo, esams, eqiad, codfw, eqsin], # Pakistan
+PK => [esams, eqiad, codfw, ulsfo, eqsin], # Pakistan
 PS => [esams, eqiad, codfw, ulsfo, eqsin], # Palestine, State of
 QA => [esams, eqiad, codfw, ulsfo, eqsin], # Qatar
 SA => [esams, eqiad, codfw, ulsfo, eqsin], # Saudi Arabia
@@ -119,20 +119,20 @@
 },
 NA => {
 US => { # United States of America
-AK => [codfw, ulsfo, eqiad, esams, eqsin], # Alaska
+AK => [ulsfo, codfw, eqiad, esams, eqsin], # Alaska
 AL => [codfw, eqiad, ulsfo, esams, eqsin], # Alabama
 AR => [codfw, eqiad, ulsfo, esams, eqsin], # Arkansas
-AZ => [codfw, ulsfo, eqiad, esams, eqsin], # Arizona
-CA => [codfw, ulsfo, eqiad, esams, eqsin], # California
+AZ => [ulsfo, codfw, eqiad, esams, eqsin], # Arizona
+CA => [ulsfo, codfw, eqiad, esams, eqsin], # California
 CO => [codfw, eqiad, ulsfo, esams, eqsin], # Colorado
 CT => [eqiad, codfw, ulsfo, esams, eqsin], # Connecticut
 DC => [eqiad, codfw, ulsfo, esams, eqsin], # District of 
Columbia
 DE => [eqiad, codfw, ulsfo, esams, eqsin], # Delaware
 FL => [eqiad, codfw, ulsfo, esams, eqsin], # Florida
 GA => [eqiad, codfw, ulsfo, esams, eqsin], # Georgia
-HI => [codfw, ulsfo, eqiad, esams, eqsin], # Hawaii
+HI => [ulsfo, codfw, eqiad, esams, eqsin], # Hawaii
 IA => [codfw, eqiad, ulsfo, esams, eqsin], # Iowa
-ID => [codfw, ulsfo, eqiad, esams, eqsin], # Idaho
+ID => [ulsfo, codfw, eqiad, esams, eqsin], # Idaho
 IL => [eqiad, codfw, ulsfo, esams, eqsin], # Illinois
 IN => [eqiad, codfw, ulsfo, esams, eqsin], # Indiana
 KS => [codfw, eqiad, ulsfo, esams, eqsin], # Kansas
@@ -145,46 +145,46 @@
 MN => [codfw, eqiad, ulsfo, esams, eqsin], # Minnesota
 MO => [codfw, eqiad, ulsfo, esams, eqsin], # Missouri
 MS => [codfw, eqiad, ulsfo, esams, eqsin], # Mississippi
-MT => [codfw, ulsfo, eqiad, esams, eqsin], # Montana
+MT => [ulsfo, codfw, eqiad, esams, eqsin], # Montana
 NC => [eqiad, codfw, ulsfo, esams, eqsin], # North Carolina
 ND => [codfw, eqiad, ulsfo, esams, eqsin], # North Dakota
 NE => [codfw, eqiad, ulsfo, esams, eqsin], # Nebraska
 NH => [eqiad, codfw, ulsfo, esams, eqsin], # New Hampshire
 NJ => [eqiad, codfw, ulsfo, esams, eqsin], # New Jersey
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Netbox - fix static path

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391893 )

Change subject: Netbox - fix static path
..


Netbox - fix static path

Change-Id: I7ee7e6e7b6c308ff79b1ab696176628402fcdd78
---
M modules/profile/templates/netbox/netbox.wikimedia.org.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/profile/templates/netbox/netbox.wikimedia.org.erb 
b/modules/profile/templates/netbox/netbox.wikimedia.org.erb
index 97f2017..b3e37c2 100644
--- a/modules/profile/templates/netbox/netbox.wikimedia.org.erb
+++ b/modules/profile/templates/netbox/netbox.wikimedia.org.erb
@@ -28,12 +28,12 @@
 
 ProxyPreserveHost On
 
-Alias /static <%= @directory%>/static
+Alias /static /srv/deployment/netbox/deploy/netbox/netbox/static
 
 # Needed to allow token-based API authentication
 WSGIPassAuthorization on
 
-/static>
+
 Options Indexes FollowSymLinks MultiViews
 AllowOverride None
 Require all granted

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee7e6e7b6c308ff79b1ab696176628402fcdd78
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Netbox - fix static path

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391893 )

Change subject: Netbox - fix static path
..

Netbox - fix static path

Change-Id: I7ee7e6e7b6c308ff79b1ab696176628402fcdd78
---
M modules/profile/templates/netbox/netbox.wikimedia.org.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/391893/1

diff --git a/modules/profile/templates/netbox/netbox.wikimedia.org.erb 
b/modules/profile/templates/netbox/netbox.wikimedia.org.erb
index 97f2017..b3e37c2 100644
--- a/modules/profile/templates/netbox/netbox.wikimedia.org.erb
+++ b/modules/profile/templates/netbox/netbox.wikimedia.org.erb
@@ -28,12 +28,12 @@
 
 ProxyPreserveHost On
 
-Alias /static <%= @directory%>/static
+Alias /static /srv/deployment/netbox/deploy/netbox/netbox/static
 
 # Needed to allow token-based API authentication
 WSGIPassAuthorization on
 
-/static>
+
 Options Indexes FollowSymLinks MultiViews
 AllowOverride None
 Require all granted

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add CNAME for netbox.wikimedia.org

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391887 )

Change subject: Add CNAME for netbox.wikimedia.org
..


Add CNAME for netbox.wikimedia.org

Change-Id: I56412b5c68255b3ceb75452941cd5b8462d32351
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 12eced2..40070fc 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -587,6 +587,8 @@
 login   600 IN DYNA geoip!text-addrs
 
 librenms1H  IN CNAMEnetmon1002
+netbox  1H  IN CNAMEnetmon1002
+
 servermon   600 IN DYNA geoip!misc-addrs
 
 payments5M  IN A208.80.155.5   ; eqiad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56412b5c68255b3ceb75452941cd5b8462d32351
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Add CNAME for netbox.wikimedia.org

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391887 )

Change subject: Add CNAME for netbox.wikimedia.org
..

Add CNAME for netbox.wikimedia.org

Change-Id: I56412b5c68255b3ceb75452941cd5b8462d32351
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/87/391887/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 12eced2..40070fc 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -587,6 +587,8 @@
 login   600 IN DYNA geoip!text-addrs
 
 librenms1H  IN CNAMEnetmon1002
+netbox  1H  IN CNAMEnetmon1002
+
 servermon   600 IN DYNA geoip!misc-addrs
 
 payments5M  IN A208.80.155.5   ; eqiad

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56412b5c68255b3ceb75452941cd5b8462d32351
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Netbox deployment followup

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391871 )

Change subject: Netbox deployment followup
..


Netbox deployment followup

Change-Id: If783e1904a8f02f49facc85380aa1a59c51e2a29
---
M modules/profile/manifests/netbox.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/profile/manifests/netbox.pp 
b/modules/profile/manifests/netbox.pp
index c6375d0..63be3f7 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -120,15 +120,15 @@
   $monitoring_ensure = 'absent'
   }
 
-  monitoring::service { 'https':
+  monitoring::service { 'netbox-ssl':
   ensure=> $monitoring_ensure,
-  description   => 'HTTPS',
+  description   => 'Netbox HTTPS',
   check_command => 'check_ssl_http_letsencrypt!netbox.wikimedia.org',
   }
 
-  monitoring::service { 'librenms':
+  monitoring::service { 'netbox-https':
   ensure=> $monitoring_ensure,
-  description   => 'LibreNMS HTTPS',
+  description   => 'Netbox HTTPS',
   check_command => 
'check_https_url!netbox.wikimedia.org!https://netbox.wikimedia.org',
   }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If783e1904a8f02f49facc85380aa1a59c51e2a29
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Netbox deployment followup

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391871 )

Change subject: Netbox deployment followup
..

Netbox deployment followup

Change-Id: If783e1904a8f02f49facc85380aa1a59c51e2a29
---
M modules/profile/manifests/netbox.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/391871/1

diff --git a/modules/profile/manifests/netbox.pp 
b/modules/profile/manifests/netbox.pp
index c6375d0..63be3f7 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -120,15 +120,15 @@
   $monitoring_ensure = 'absent'
   }
 
-  monitoring::service { 'https':
+  monitoring::service { 'netbox-ssl':
   ensure=> $monitoring_ensure,
-  description   => 'HTTPS',
+  description   => 'Netbox HTTPS',
   check_command => 'check_ssl_http_letsencrypt!netbox.wikimedia.org',
   }
 
-  monitoring::service { 'librenms':
+  monitoring::service { 'netbox-https':
   ensure=> $monitoring_ensure,
-  description   => 'LibreNMS HTTPS',
+  description   => 'Netbox HTTPS',
   check_command => 
'check_https_url!netbox.wikimedia.org!https://netbox.wikimedia.org',
   }
 

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Puppetize Netbox

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387880 )

Change subject: Puppetize Netbox
..


Puppetize Netbox

 - Setup apache with Let's encrypt
 - Install master/slave Postgres
 - Install configuration files (main+LDAP)
 - Add monitoring
 - Configure uwsgi

Bug: T170144
Change-Id: Ia3354fcf251952a27d58eba3487043d8d4bd26fe
---
M hieradata/common.yaml
M hieradata/role/common/deployment_server.yaml
M manifests/site.pp
A modules/netbox/manifests/init.pp
A modules/netbox/templates/configuration.py.erb
A modules/netbox/templates/ldap_config.py.erb
A modules/profile/manifests/netbox.pp
A modules/profile/templates/netbox/netbox.wikimedia.org.erb
A modules/role/manifests/netbox.pp
9 files changed, 517 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8614e34..370db71 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -555,6 +555,7 @@
 install_server_failover: install2002.wikimedia.org
 
 netmon_server: netmon1002.wikimedia.org
+profile::netbox::netbox_server: netmon1002.wikimedia.org
 
 releases_server: releases1001.eqiad.wmnet
 releases_server_failover: releases2001.codfw.wmnet
diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 8eac2e3..0c2d584 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -94,7 +94,7 @@
 #lvs_service: citoid
   cpjobqueue/deploy: {
 repository: mediawiki/services/change-propagation/jobqueue-deploy
-  }
+}
   cxserver/deploy: {}
 #lvs_service: cxserver
   dumps/dumps:
@@ -173,6 +173,9 @@
   # Librenms software
   librenms/librenms:
 repository: operations/software/librenms
+  # Netbox software
+  netbox/deploy:
+repository: operations/software/netbox-deploy
   relforge/mjolnir:
 repository: search/MjoLniR
   statsv/statsv:
diff --git a/manifests/site.pp b/manifests/site.pp
index c73ca89..398c1be 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1938,7 +1938,7 @@
 
 # network monitoring tools, stretch (T125020, T166180)
 node /^netmon(1002|2001)\.wikimedia\.org$/ {
-role(network::monitor, librenms, rancid, smokeping)
+role(network::monitor, librenms, rancid, smokeping, netbox)
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/netbox/manifests/init.pp b/modules/netbox/manifests/init.pp
new file mode 100644
index 000..5af75d5
--- /dev/null
+++ b/modules/netbox/manifests/init.pp
@@ -0,0 +1,101 @@
+# == Class: netbox::base
+#
+# Installs Netbox
+#
+# === Parameters
+#
+# [*secret_key*]
+#   Django secret key
+#
+# [*ldap_password*]
+#   Password of the LDAP bind used
+#
+# [*db_password*]
+#   Password of the database user netbox
+#
+# [*debug*]
+#   Turn on django debugging
+#
+# [*port*]
+#   Port the pyton app listen on
+#
+# [*admins*]
+#   Name and email of the django admin contacts
+#
+# [*config_path*]
+#   Path to the deploy directory
+#
+# [*venv_path*]
+#   Path to the python virtualenv
+#
+# [*directory*]
+#   Path to the netbox app
+#
+# [*ensure*]
+#   installs/removes config files
+#
+class netbox(
+$secret_key,
+$ldap_password,
+$db_password,
+$debug=false,
+$port=8001,
+$admins=false,
+$config_path = '/srv/deployment/netbox/deploy',
+$venv_path = '/srv/deployment/netbox/venv',
+$directory = '/srv/deployment/netbox/deploy/netbox',
+$ensure='present',
+
+) {
+
+  require_package('virtualenv', 'python3-pip')
+
+
+  file { "${directory}/netbox/netbox/configuration.py":
+  ensure  => $ensure,
+  owner   => 'root',
+  group   => 'www-data',
+  mode=> '0440',
+  content => template('netbox/configuration.py.erb'),
+  require => Scap::Target['netbox/deploy'],
+  before  => Uwsgi::App['netbox'],
+  }
+
+  file { "${directory}/netbox/netbox/ldap_config.py":
+  ensure  => $ensure,
+  owner   => 'root',
+  group   => 'www-data',
+  mode=> '0440',
+  content => template('netbox/ldap_config.py.erb'),
+  require => Scap::Target['netbox/deploy'],
+  before  => Uwsgi::App['netbox'],
+  }
+
+  service::uwsgi { 'netbox':
+  port=> $port,
+  deployment_user => 'deploy-librenms',
+  config  => {
+  need-plugins => 'python3',
+  chdir=> "${directory}/netbox",
+  venv => $venv_path,
+  wsgi => 'netbox.wsgi',
+  vacuum   => true,
+  http-socket  => "127.0.0.1:${port}",
+  # T170189: make sure Python has a sane default encoding
+  env  => [
+  'LANG=C.UTF-8',
+  'PYTHONENCODING=utf-8',
+  ],
+  },
+  healthcheck_url => '/login/',
+  icinga_check=> false,
+  sudo_rules  => [
+  

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Only send eqsin countries to ulsfo

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391357 )

Change subject: DNS: Only send eqsin countries to ulsfo
..


DNS: Only send eqsin countries to ulsfo

Change-Id: Ief194b3e0dbbe407e7614b3f24489c1cae00c5fe
---
M geo-maps
1 file changed, 27 insertions(+), 27 deletions(-)

Approvals:
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Ayounsi: Looks good to me, approved



diff --git a/geo-maps b/geo-maps
index d256477..b07bdeb 100644
--- a/geo-maps
+++ b/geo-maps
@@ -23,8 +23,8 @@
 HK => [ulsfo, codfw, eqiad, esams, eqsin], # Hong Kong
 ID => [ulsfo, codfw, eqiad, esams, eqsin], # Indonesia
 IL => [esams, eqiad, codfw, ulsfo, eqsin], # Israel
-IN => [esams, eqiad, codfw, ulsfo, eqsin], # India
-IO => [esams, eqiad, codfw, ulsfo, eqsin], # British Indian Ocean 
Territory
+IN => [ulsfo, esams, eqiad, codfw, eqsin], # India
+IO => [ulsfo, esams, eqiad, codfw, eqsin], # British Indian Ocean 
Territory
 IQ => [esams, eqiad, codfw, ulsfo, eqsin], # Iraq
 IR => [esams, eqiad, codfw, ulsfo, eqsin], # Iran (Islamic 
Republic of)
 JO => [esams, eqiad, codfw, ulsfo, eqsin], # Jordan
@@ -37,7 +37,7 @@
 KZ => [esams, eqiad, codfw, ulsfo, eqsin], # Kazakhstan
 LA => [ulsfo, codfw, eqiad, esams, eqsin], # Lao People's 
Democratic Republic
 LB => [esams, eqiad, codfw, ulsfo, eqsin], # Lebanon
-LK => [esams, eqiad, codfw, ulsfo, eqsin], # Sri Lanka
+LK => [ulsfo, esams, eqiad, codfw, eqsin], # Sri Lanka
 MM => [ulsfo, codfw, eqiad, esams, eqsin], # Myanmar
 MN => [ulsfo, codfw, eqiad, esams, eqsin], # Mongolia
 MO => [ulsfo, codfw, eqiad, esams, eqsin], # Macao
@@ -46,7 +46,7 @@
 NP => [ulsfo, codfw, eqiad, esams, eqsin], # Nepal
 OM => [esams, eqiad, codfw, ulsfo, eqsin], # Oman
 PH => [ulsfo, codfw, eqiad, esams, eqsin], # Philippines
-PK => [esams, eqiad, codfw, ulsfo, eqsin], # Pakistan
+PK => [ulsfo, esams, eqiad, codfw, eqsin], # Pakistan
 PS => [esams, eqiad, codfw, ulsfo, eqsin], # Palestine, State of
 QA => [esams, eqiad, codfw, ulsfo, eqsin], # Qatar
 SA => [esams, eqiad, codfw, ulsfo, eqsin], # Saudi Arabia
@@ -119,20 +119,20 @@
 },
 NA => {
 US => { # United States of America
-AK => [ulsfo, codfw, eqiad, esams, eqsin], # Alaska
+AK => [codfw, ulsfo, eqiad, esams, eqsin], # Alaska
 AL => [codfw, eqiad, ulsfo, esams, eqsin], # Alabama
 AR => [codfw, eqiad, ulsfo, esams, eqsin], # Arkansas
-AZ => [ulsfo, codfw, eqiad, esams, eqsin], # Arizona
-CA => [ulsfo, codfw, eqiad, esams, eqsin], # California
+AZ => [codfw, ulsfo, eqiad, esams, eqsin], # Arizona
+CA => [codfw, ulsfo, eqiad, esams, eqsin], # California
 CO => [codfw, eqiad, ulsfo, esams, eqsin], # Colorado
 CT => [eqiad, codfw, ulsfo, esams, eqsin], # Connecticut
 DC => [eqiad, codfw, ulsfo, esams, eqsin], # District of 
Columbia
 DE => [eqiad, codfw, ulsfo, esams, eqsin], # Delaware
 FL => [eqiad, codfw, ulsfo, esams, eqsin], # Florida
 GA => [eqiad, codfw, ulsfo, esams, eqsin], # Georgia
-HI => [ulsfo, codfw, eqiad, esams, eqsin], # Hawaii
+HI => [codfw, ulsfo, eqiad, esams, eqsin], # Hawaii
 IA => [codfw, eqiad, ulsfo, esams, eqsin], # Iowa
-ID => [ulsfo, codfw, eqiad, esams, eqsin], # Idaho
+ID => [codfw, ulsfo, eqiad, esams, eqsin], # Idaho
 IL => [eqiad, codfw, ulsfo, esams, eqsin], # Illinois
 IN => [eqiad, codfw, ulsfo, esams, eqsin], # Indiana
 KS => [codfw, eqiad, ulsfo, esams, eqsin], # Kansas
@@ -145,46 +145,46 @@
 MN => [codfw, eqiad, ulsfo, esams, eqsin], # Minnesota
 MO => [codfw, eqiad, ulsfo, esams, eqsin], # Missouri
 MS => [codfw, eqiad, ulsfo, esams, eqsin], # Mississippi
-MT => [ulsfo, codfw, eqiad, esams, eqsin], # Montana
+MT => [codfw, ulsfo, eqiad, esams, eqsin], # Montana
 NC => [eqiad, codfw, ulsfo, esams, eqsin], # North Carolina
 ND => [codfw, eqiad, ulsfo, esams, eqsin], # North Dakota
 NE => [codfw, eqiad, ulsfo, esams, eqsin], # Nebraska
 NH => [eqiad, codfw, ulsfo, esams, eqsin], # New Hampshire
 NJ => [eqiad, codfw, ulsfo, esams, eqsin], # New Jersey
 NM => [codfw, eqiad, ulsfo, esams, eqsin], # New Mexico
-NV => 

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Only send eqsin countries to ulsfo

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391357 )

Change subject: DNS: Only send eqsin countries to ulsfo
..

DNS: Only send eqsin countries to ulsfo

Change-Id: Ief194b3e0dbbe407e7614b3f24489c1cae00c5fe
---
M geo-maps
1 file changed, 19 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/57/391357/1

diff --git a/geo-maps b/geo-maps
index d256477..7d797f7 100644
--- a/geo-maps
+++ b/geo-maps
@@ -23,8 +23,8 @@
 HK => [ulsfo, codfw, eqiad, esams, eqsin], # Hong Kong
 ID => [ulsfo, codfw, eqiad, esams, eqsin], # Indonesia
 IL => [esams, eqiad, codfw, ulsfo, eqsin], # Israel
-IN => [esams, eqiad, codfw, ulsfo, eqsin], # India
-IO => [esams, eqiad, codfw, ulsfo, eqsin], # British Indian Ocean 
Territory
+IN => [ulsfo, esams, eqiad, codfw, eqsin], # India
+IO => [ulsfo, esams, eqiad, codfw, eqsin], # British Indian Ocean 
Territory
 IQ => [esams, eqiad, codfw, ulsfo, eqsin], # Iraq
 IR => [esams, eqiad, codfw, ulsfo, eqsin], # Iran (Islamic 
Republic of)
 JO => [esams, eqiad, codfw, ulsfo, eqsin], # Jordan
@@ -37,7 +37,7 @@
 KZ => [esams, eqiad, codfw, ulsfo, eqsin], # Kazakhstan
 LA => [ulsfo, codfw, eqiad, esams, eqsin], # Lao People's 
Democratic Republic
 LB => [esams, eqiad, codfw, ulsfo, eqsin], # Lebanon
-LK => [esams, eqiad, codfw, ulsfo, eqsin], # Sri Lanka
+LK => [ulsfo, esams, eqiad, codfw, eqsin], # Sri Lanka
 MM => [ulsfo, codfw, eqiad, esams, eqsin], # Myanmar
 MN => [ulsfo, codfw, eqiad, esams, eqsin], # Mongolia
 MO => [ulsfo, codfw, eqiad, esams, eqsin], # Macao
@@ -46,7 +46,7 @@
 NP => [ulsfo, codfw, eqiad, esams, eqsin], # Nepal
 OM => [esams, eqiad, codfw, ulsfo, eqsin], # Oman
 PH => [ulsfo, codfw, eqiad, esams, eqsin], # Philippines
-PK => [esams, eqiad, codfw, ulsfo, eqsin], # Pakistan
+PK => [ulsfo, esams, eqiad, codfw, eqsin], # Pakistan
 PS => [esams, eqiad, codfw, ulsfo, eqsin], # Palestine, State of
 QA => [esams, eqiad, codfw, ulsfo, eqsin], # Qatar
 SA => [esams, eqiad, codfw, ulsfo, eqsin], # Saudi Arabia
@@ -119,20 +119,20 @@
 },
 NA => {
 US => { # United States of America
-AK => [ulsfo, codfw, eqiad, esams, eqsin], # Alaska
+AK => [codfw, ulsfo, eqiad, esams, eqsin], # Alaska
 AL => [codfw, eqiad, ulsfo, esams, eqsin], # Alabama
 AR => [codfw, eqiad, ulsfo, esams, eqsin], # Arkansas
-AZ => [ulsfo, codfw, eqiad, esams, eqsin], # Arizona
-CA => [ulsfo, codfw, eqiad, esams, eqsin], # California
+AZ => [codfw, ulsfo, eqiad, esams, eqsin], # Arizona
+CA => [codfw, ulsfo, eqiad, esams, eqsin], # California
 CO => [codfw, eqiad, ulsfo, esams, eqsin], # Colorado
 CT => [eqiad, codfw, ulsfo, esams, eqsin], # Connecticut
 DC => [eqiad, codfw, ulsfo, esams, eqsin], # District of 
Columbia
 DE => [eqiad, codfw, ulsfo, esams, eqsin], # Delaware
 FL => [eqiad, codfw, ulsfo, esams, eqsin], # Florida
 GA => [eqiad, codfw, ulsfo, esams, eqsin], # Georgia
-HI => [ulsfo, codfw, eqiad, esams, eqsin], # Hawaii
+HI => [codfw, ulsfo, eqiad, esams, eqsin], # Hawaii
 IA => [codfw, eqiad, ulsfo, esams, eqsin], # Iowa
-ID => [ulsfo, codfw, eqiad, esams, eqsin], # Idaho
+ID => [codfw, ulsfo, eqiad, esams, eqsin], # Idaho
 IL => [eqiad, codfw, ulsfo, esams, eqsin], # Illinois
 IN => [eqiad, codfw, ulsfo, esams, eqsin], # Indiana
 KS => [codfw, eqiad, ulsfo, esams, eqsin], # Kansas
@@ -145,46 +145,46 @@
 MN => [codfw, eqiad, ulsfo, esams, eqsin], # Minnesota
 MO => [codfw, eqiad, ulsfo, esams, eqsin], # Missouri
 MS => [codfw, eqiad, ulsfo, esams, eqsin], # Mississippi
-MT => [ulsfo, codfw, eqiad, esams, eqsin], # Montana
+MT => [codfw, ulsfo, eqiad, esams, eqsin], # Montana
 NC => [eqiad, codfw, ulsfo, esams, eqsin], # North Carolina
 ND => [codfw, eqiad, ulsfo, esams, eqsin], # North Dakota
 NE => [codfw, eqiad, ulsfo, esams, eqsin], # Nebraska
 NH => [eqiad, codfw, ulsfo, esams, eqsin], # New Hampshire
 NJ => [eqiad, codfw, ulsfo, esams, eqsin], # New Jersey
 NM => [codfw, eqiad, ulsfo, esams, eqsin], # New Mexico
-NV => [ulsfo, codfw, eqiad, esams, eqsin], # Nevada
+   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] Have every rdns advertise a private anycast VIP

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391149 )

Change subject: [WIP] Have every rdns advertise a private anycast VIP
..

[WIP] Have every rdns advertise a private anycast VIP

Change-Id: I56b16355ee33cd68a6246f08fc16c20f10da3df2
---
A hieradata/hosts/acamar.yaml
M hieradata/role/common/dnsrecursor.yaml
A modules/bird/manifests/init.pp
A modules/bird/templates/bird.service.erb
A modules/bird/templates/bird_anycast.conf.erb
A modules/profile/manifests/bird/anycast.pp
M modules/role/manifests/dnsrecursor.pp
7 files changed, 167 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/391149/1

diff --git a/hieradata/hosts/acamar.yaml b/hieradata/hosts/acamar.yaml
new file mode 100644
index 000..219afcd
--- /dev/null
+++ b/hieradata/hosts/acamar.yaml
@@ -0,0 +1,3 @@
+profile::bird::neighbors_list:
+  - 208.80.153.2 # cr1-codfw ae1:2001
+  - 208.80.153.3 # cr2-codfw ae1:2001
diff --git a/hieradata/role/common/dnsrecursor.yaml 
b/hieradata/role/common/dnsrecursor.yaml
index 49549d1..b2c2243 100644
--- a/hieradata/role/common/dnsrecursor.yaml
+++ b/hieradata/role/common/dnsrecursor.yaml
@@ -1 +1,6 @@
 standard::has_ganglia: false
+
+profile::bird::advertise_vips:
+  rec-dns-anycast-vip: 10.3.0.1/32
+
+profile::bird::bind_service: 'pdns-recursor.service'
diff --git a/modules/bird/manifests/init.pp b/modules/bird/manifests/init.pp
new file mode 100644
index 000..a114dba
--- /dev/null
+++ b/modules/bird/manifests/init.pp
@@ -0,0 +1,52 @@
+# == Class: bird::base
+#
+# Installs Bird
+# Let the option to "bindTo" the Bird service to another service 
(watchdog-like)
+#
+#
+class bird(
+  $neighbors,
+  $bfd = true,
+  $bind_service = '',
+  $routerid= $::ipaddress,
+  ){
+
+  require_package('bird')
+
+  if $bind_service != '' {
+file { '/lib/systemd/system/bird.service':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => template('bird/bird.service.erb'),
+require => Package['bird'],
+}
+exec { 'bird-systemd-reload':
+command => 'systemctl daemon-reload',
+path=> [ '/usr/bin', '/bin', '/usr/sbin' ],
+refreshonly => true,
+}
+  }
+
+  service { 'bird':
+  ensure  => running,
+  enable  => true,
+  require => Package['bird'],
+  }
+
+  service { 'bird6':
+  ensure  => stopped,
+  enable  => false,
+  require => Package['bird'],
+  }
+
+  file { '/etc/bird/bird.conf':
+  ensure  => present,
+  owner   => 'bird',
+  group   => 'bird',
+  mode=> '0640',
+  content => template('bird/bird_anycast.conf.erb'),
+  }
+
+}
diff --git a/modules/bird/templates/bird.service.erb 
b/modules/bird/templates/bird.service.erb
new file mode 100644
index 000..319ac98
--- /dev/null
+++ b/modules/bird/templates/bird.service.erb
@@ -0,0 +1,17 @@
+[Unit]
+Description=BIRD Internet Routing Daemon (IPv4)
+
+After=<%= @bind_service %>
+BindsTo=<%= @bind_service %>
+
+[Service]
+EnvironmentFile=/etc/bird/envvars
+ExecStartPre=/usr/lib/bird/prepare-environment
+ExecStartPre=/usr/sbin/bird -p
+ExecReload=/usr/sbin/birdc configure
+ExecStart=/usr/sbin/bird -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP $BIRD_ARGS
+Restart=on-abort
+
+[Install]
+## https://github.com/systemd/systemd/issues/720
+WantedBy=<%= @bind_service %>
diff --git a/modules/bird/templates/bird_anycast.conf.erb 
b/modules/bird/templates/bird_anycast.conf.erb
new file mode 100644
index 000..f108d07
--- /dev/null
+++ b/modules/bird/templates/bird_anycast.conf.erb
@@ -0,0 +1,47 @@
+
+router id <%= @routerid %>;
+
+protocol device {
+}
+
+protocol kernel {
+   metric 64;
+   import none;
+}
+
+protocol direct {
+   interface "*";
+}
+
+filter vips_filter{
+if ( net.len = 32 && net ~ 10.3.0.0/24 ) then {
+accept;
+}
+else {
+reject;
+}
+}
+
+<%- if @bfd -%>
+protocol bfd {
+interface "*" {
+interval 300 ms;
+multiplier 3;
+};
+}
+<%- end -%>
+
+
+protocol bgp {
+   import none;
+   export filter vips_filter;
+   local as 64605;
+  check link yes;
+  <% @neighbors.each do |neighbor| %>
+  neighbor <%= @neighbor %> as 14907;
+  <% end %>
+  <%- if @bfd -%>
+   bfd yes;
+  <%- end -%>
+
+}
diff --git a/modules/profile/manifests/bird/anycast.pp 
b/modules/profile/manifests/bird/anycast.pp
new file mode 100644
index 000..b048a39
--- /dev/null
+++ b/modules/profile/manifests/bird/anycast.pp
@@ -0,0 +1,42 @@
+# == Class: bird::base
+#
+# Installs and configure Bird
+# Configure Ferm
+#
+#
+class profile::bird::anycast(
+  $bfd = hiera('profile::bird::bfd', true),
+  $neighbors_list = hiera('profile::bird::neighbors_list', []),
+  $bind_service = hiera('profile::bird::bind_service', ''),
+  $advertise_vips = 

[MediaWiki-commits] [Gerrit] operations/dns[master]: reserve internal anycast range

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391131 )

Change subject: reserve internal anycast range
..

reserve internal anycast range

Change-Id: Ie97f0e89fce277d3e09835c3083d30d8c78446d6
---
M templates/10.in-addr.arpa
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/31/391131/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0ed7330..402a984 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -99,6 +99,12 @@
 
 $ORIGIN 5.2.{{ zonename }}.
 
+; 10.3.0.0/24 - Internal anycast services
+
+$ORIGIN 0.3.{{ zonename }}.
+
+
+
 ;
 ; ESAMS
 ;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie97f0e89fce277d3e09835c3083d30d8c78446d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix wrong hostname for dns4001/4002

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390434 )

Change subject: Fix wrong hostname for dns4001/4002
..


Fix wrong hostname for dns4001/4002

 - This is most likely what prevented its proper puppetization,
including iptables

Change-Id: I6c7fa6941589e12bed89a1bc340765bf12149d09
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Ayounsi: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index ad719fe..c0e5d4c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -749,7 +749,7 @@
 }
 
 # new dns systems T179204
-node /^dns400[12]\.ulsfo\.wmnet$/ {
+node /^dns400[12]\.wikimedia\.org$/ {
 role(spare::system)
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c7fa6941589e12bed89a1bc340765bf12149d09
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix wrong hostname for dns4001/4002

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390434 )

Change subject: Fix wrong hostname for dns4001/4002
..

Fix wrong hostname for dns4001/4002

 - This is most likely what prevented its proper puppetization,
including iptables

Change-Id: I6c7fa6941589e12bed89a1bc340765bf12149d09
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/390434/1

diff --git a/manifests/site.pp b/manifests/site.pp
index ad719fe..c0e5d4c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -749,7 +749,7 @@
 }
 
 # new dns systems T179204
-node /^dns400[12]\.ulsfo\.wmnet$/ {
+node /^dns400[12]\.wikimedia\.org$/ {
 role(spare::system)
 }
 

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] Bird-lg

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390330 )

Change subject: [WIP] Bird-lg
..

[WIP] Bird-lg

Change-Id: I3bbd8851a67fde8d9d778f6d3c263879ccfd659a
---
A modules/birdlg/manifests/lg_backend.pp
A modules/birdlg/manifests/lg_frontend.pp
A modules/birdlg/templates/lg.cfg.erb
A modules/birdlg/templates/lgproxy.cfg.erb
A modules/profile/manifests/birdlg/lg_backend.pp
A modules/profile/manifests/birdlg/lg_frontend.pp
A modules/profile/templates/birdlg/lg.wikimedia.org.erb
A modules/role/manifests/birdlg/lg_backend.pp
A modules/role/manifests/birdlg/lg_frontend.pp
9 files changed, 351 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/390330/1

diff --git a/modules/birdlg/manifests/lg_backend.pp 
b/modules/birdlg/manifests/lg_backend.pp
new file mode 100644
index 000..047ea4f
--- /dev/null
+++ b/modules/birdlg/manifests/lg_backend.pp
@@ -0,0 +1,80 @@
+# == Class: librenms
+#
+# This class installs & manages Bird and lgproxy, the backend part of BirdLG
+#
+class birdlg::lg_backend(
+$install_dir='/srv/deployment/birdlg/',
+$access_list=['127.0.0.1'],
+$port = 5000,
+) {
+
+  package { [
+  'python-flask',
+  'python-dnspython',
+  'python-memcache',
+  'whois',
+  'traceroute',
+  'bird',
+  ]:
+  ensure => present,
+  }
+
+file { '/etc/bird/bird.conf':  # TODO
+ensure  => present,
+owner   => 'bird',
+group   => 'bird',
+mode=> '0440',
+content => template('birdlg/bird.conf.erb'),
+}
+file { '/etc/bird/bird6.conf':  # TODO
+ensure  => present,
+owner   => 'bird',
+group   => 'bird',
+mode=> '0440',
+content => template('birdlg/bird6.conf.erb'),
+}
+
+service { 'bird':
+ensure=> running,
+subscribe => [
+  File['/etc/bird/bird.conf'],
+  File['/etc/bird/bird6.conf'],
+  ],
+require   => Package['bird'],
+}
+
+file { "${install_dir}/lgproxy.cfg":
+ensure  => present,
+owner   => 'bird',
+group   => 'bird',
+mode=> '0440',
+content => template('birdlg/lgproxy.cfg.erb'),
+}
+
+service::uwsgi { 'lgproxy':
+port=> $port,
+deployment_user => 'bird',   # TODO
+config  => {
+need-plugins => 'python',
+chdir=> $install_dir,
+wsgi => 'lgproxy.wsgi',
+vacuum   => true,
+http-socket  => "0.0.0.0:${port}",
+# T170189: make sure Python has a sane default encoding
+env  => [
+'LANG=C.UTF-8',
+'PYTHONENCODING=utf-8',
+],
+},
+healthcheck_url => '/',
+icinga_check=> false,
+sudo_rules  => [
+'ALL=(root) NOPASSWD: /usr/sbin/service uwsgi-lgproxy restart',
+'ALL=(root) NOPASSWD: /usr/sbin/service uwsgi-lgproxy start',
+'ALL=(root) NOPASSWD: /usr/sbin/service uwsgi-lgproxy status',
+'ALL=(root) NOPASSWD: /usr/sbin/service uwsgi-lgproxy stop',
+],
+}
+
+
+}
diff --git a/modules/birdlg/manifests/lg_frontend.pp 
b/modules/birdlg/manifests/lg_frontend.pp
new file mode 100644
index 000..1eeb1ad
--- /dev/null
+++ b/modules/birdlg/manifests/lg_frontend.pp
@@ -0,0 +1,29 @@
+# == Class: librenms
+#
+# This class installs & manages bird-lg frontend
+#
+class birdlg::lg_frontend(
+$session_key, #TODO
+$install_dir='/srv/deployment/birdlg/',
+) {
+
+
+  package { [
+  'python-flask',
+  'python-dnspython',
+  'python-pydot',
+  'python-memcache',
+  'graphviz',
+  ]:
+  ensure => present,
+  }
+
+  file { "${install_dir}/lg.cfg":
+  ensure  => present,
+  owner   => 'bird',
+  group   => 'bird',
+  mode=> '0440',
+  content => template('birdlg/lg.cfg.erb'),
+  }
+
+}
diff --git a/modules/birdlg/templates/lg.cfg.erb 
b/modules/birdlg/templates/lg.cfg.erb
new file mode 100644
index 000..cddcadd
--- /dev/null
+++ b/modules/birdlg/templates/lg.cfg.erb
@@ -0,0 +1,32 @@
+DEBUG = False
+LOG_FILE="<%= @install_dir %>/lg.log"
+LOG_LEVEL="WARNING"
+
+DOMAIN = "lg.wikimedia.org"
+
+BIND_IP = "127.0.0.1"
+BIND_PORT = 5001
+
+## TODO: Need to either add a line to /etc/hosts or a A record for PROXY.DOMAIN
+PROXY = {
+   "codfw": 5000,
+   "eqiad": 5000,
+   }
+
+# Used for bgpmap
+ROUTER_IP = {
+"codfw" : ["208.80.153.192", "2620:0:860:::1", "208.80.153.193", 
"2620:0:860:::2", "208.80.153.198", "2620:0:860:::5"],
+"eqiad" : ["208.80.154.196", "2620:0:861:::1", "208.80.154.197", 
"2620:0:861:::2"],
+}
+
+AS_NUMBER = {
+"codfw" : "14907",
+"eqiad" : 

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Update submodules to netbox 2.2.4 and matching wheels

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389895 )

Change subject: Update submodules to netbox 2.2.4 and matching wheels
..


Update submodules to netbox 2.2.4 and matching wheels

Change-Id: Icc0f11f373c5f3cb4278a0966713463c4336442d
---
M netbox
M wheels
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/netbox b/netbox
index 97d89e4..cae33f1 16
--- a/netbox
+++ b/netbox
@@ -1 +1 @@
-Subproject commit 97d89e48f481f25c0c12101eb67e67ae31db5808
+Subproject commit cae33f15ccf29bf928b090a5752f7ba8be670e7d
diff --git a/wheels b/wheels
index 435e746..a83a5dd 16
--- a/wheels
+++ b/wheels
@@ -1 +1 @@
-Subproject commit 435e746abe26c32ff9a5ff7c3d5b068dc2c1cd2e
+Subproject commit a83a5ddcad505ec2b64068fe018ca72473bfa059

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc0f11f373c5f3cb4278a0966713463c4336442d
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Update submodules to netbox 2.2.4 and matching wheels

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389895 )

Change subject: Update submodules to netbox 2.2.4 and matching wheels
..

Update submodules to netbox 2.2.4 and matching wheels

Change-Id: Icc0f11f373c5f3cb4278a0966713463c4336442d
---
M netbox
M wheels
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/netbox-deploy 
refs/changes/95/389895/1

diff --git a/netbox b/netbox
index 97d89e4..cae33f1 16
--- a/netbox
+++ b/netbox
@@ -1 +1 @@
-Subproject commit 97d89e48f481f25c0c12101eb67e67ae31db5808
+Subproject commit cae33f15ccf29bf928b090a5752f7ba8be670e7d
diff --git a/wheels b/wheels
index 435e746..a83a5dd 16
--- a/wheels
+++ b/wheels
@@ -1 +1 @@
-Subproject commit 435e746abe26c32ff9a5ff7c3d5b068dc2c1cd2e
+Subproject commit a83a5ddcad505ec2b64068fe018ca72473bfa059

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc0f11f373c5f3cb4278a0966713463c4336442d
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Add make_wheels.sh

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389890 )

Change subject: Add make_wheels.sh
..


Add make_wheels.sh

Change-Id: I8221aea361c961d7061c71afa31a2a4936a629db
---
A make_wheels.sh
R requirements_tmp.txt
2 files changed, 26 insertions(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/make_wheels.sh b/make_wheels.sh
new file mode 100644
index 000..a143f1e
--- /dev/null
+++ b/make_wheels.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Build wheels for distribution
+set -o errexit
+set -o nounset
+set -o pipefail
+
+BASE=$(realpath $(dirname $0))
+BUILD=${BASE}/_build
+VENV=${BUILD}/venv
+WHEEL_DIR=${BASE}/wheels
+REQUIREMENTS=${BASE}/requirements_tmp.txt
+REQUIREMENTS_FIXED=${BASE}/requirements.txt
+
+PIP=${VENV}/bin/pip
+
+mkdir -p $VENV
+virtualenv --python python3 $VENV || /bin/true
+$PIP install -r $REQUIREMENTS
+$PIP freeze --local --requirement $REQUIREMENTS_FIXED > $REQUIREMENTS_FIXED
+# https://github.com/pypa/pip/issues/4668
+sed -i '/pkg-resources==0.0.0/d' $REQUIREMENTS_FIXED
+$PIP install wheel
+$PIP wheel --find-links $WHEEL_DIR \
+   --wheel-dir $WHEEL_DIR \
+   --requirement $REQUIREMENTS_FIXED
+
diff --git a/requirements.txt b/requirements_tmp.txt
similarity index 100%
rename from requirements.txt
rename to requirements_tmp.txt

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8221aea361c961d7061c71afa31a2a4936a629db
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Add fixed requirements for netbox 2.2.4

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389891 )

Change subject: Add fixed requirements for netbox 2.2.4
..


Add fixed requirements for netbox 2.2.4

Change-Id: I9e6ccf8220effbe5766c2c80b022c1ac5e9841ce
---
A requirements.txt
1 file changed, 58 insertions(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000..3bc7d9b
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,58 @@
+## The following requirements were added by pip freeze:
+asn1crypto==0.23.0
+bcrypt==3.1.4
+certifi==2017.11.5
+cffi==1.11.2
+chardet==3.0.4
+coreapi==2.3.3
+coreschema==0.0.4
+cryptography==2.1.3
+Django==1.11.7
+django-auth-ldap==1.2.16
+django-cors-headers==2.1.0
+django-debug-toolbar==1.8
+django-filter==1.1.0
+django-mptt==0.8.7
+django-rest-swagger==2.1.2
+django-tables2==1.14.2
+djangorestframework==3.7.3
+future==0.16.0
+graphviz==0.8.1
+idna==2.6
+itypes==1.1.0
+Jinja2==2.9.6
+jtextfsm==0.3.1
+junos-eznc==2.1.7
+lxml==4.1.1
+Markdown==2.6.9
+MarkupSafe==1.0
+napalm==2.0.0
+natsort==5.1.0
+ncclient==0.5.3
+netaddr==0.7.18
+netmiko==1.4.3
+olefile==0.44
+openapi-codec==1.3.2
+paramiko==2.3.1
+Pillow==4.3.0
+psycopg2==2.7.3.2
+py-gfm==0.1.3
+pyasn1==0.3.7
+pycparser==2.18
+pycryptodome==3.4.7
+pyeapi==0.8.1
+pyIOSXR==0.52
+pyldap==2.4.37
+PyNaCl==1.2.0
+pynxos==0.0.3
+pyserial==3.4
+pytz==2017.3
+PyYAML==3.12
+requests==2.18.4
+scp==0.10.2
+simplejson==3.12.0
+six==1.11.0
+sqlparse==0.2.4
+uritemplate==3.0.0
+urllib3==1.22
+xmltodict==0.11.0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e6ccf8220effbe5766c2c80b022c1ac5e9841ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Add fixed requirements for netbox 2.2.4

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389891 )

Change subject: Add fixed requirements for netbox 2.2.4
..

Add fixed requirements for netbox 2.2.4

Change-Id: I9e6ccf8220effbe5766c2c80b022c1ac5e9841ce
---
A requirements.txt
1 file changed, 58 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/netbox-deploy 
refs/changes/91/389891/1

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000..3bc7d9b
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,58 @@
+## The following requirements were added by pip freeze:
+asn1crypto==0.23.0
+bcrypt==3.1.4
+certifi==2017.11.5
+cffi==1.11.2
+chardet==3.0.4
+coreapi==2.3.3
+coreschema==0.0.4
+cryptography==2.1.3
+Django==1.11.7
+django-auth-ldap==1.2.16
+django-cors-headers==2.1.0
+django-debug-toolbar==1.8
+django-filter==1.1.0
+django-mptt==0.8.7
+django-rest-swagger==2.1.2
+django-tables2==1.14.2
+djangorestframework==3.7.3
+future==0.16.0
+graphviz==0.8.1
+idna==2.6
+itypes==1.1.0
+Jinja2==2.9.6
+jtextfsm==0.3.1
+junos-eznc==2.1.7
+lxml==4.1.1
+Markdown==2.6.9
+MarkupSafe==1.0
+napalm==2.0.0
+natsort==5.1.0
+ncclient==0.5.3
+netaddr==0.7.18
+netmiko==1.4.3
+olefile==0.44
+openapi-codec==1.3.2
+paramiko==2.3.1
+Pillow==4.3.0
+psycopg2==2.7.3.2
+py-gfm==0.1.3
+pyasn1==0.3.7
+pycparser==2.18
+pycryptodome==3.4.7
+pyeapi==0.8.1
+pyIOSXR==0.52
+pyldap==2.4.37
+PyNaCl==1.2.0
+pynxos==0.0.3
+pyserial==3.4
+pytz==2017.3
+PyYAML==3.12
+requests==2.18.4
+scp==0.10.2
+simplejson==3.12.0
+six==1.11.0
+sqlparse==0.2.4
+uritemplate==3.0.0
+urllib3==1.22
+xmltodict==0.11.0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e6ccf8220effbe5766c2c80b022c1ac5e9841ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Add make_wheels.sh

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389890 )

Change subject: Add make_wheels.sh
..

Add make_wheels.sh

Change-Id: I8221aea361c961d7061c71afa31a2a4936a629db
---
A make_wheels.sh
R requirements_tmp.txt
2 files changed, 26 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/netbox-deploy 
refs/changes/90/389890/1

diff --git a/make_wheels.sh b/make_wheels.sh
new file mode 100644
index 000..a143f1e
--- /dev/null
+++ b/make_wheels.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Build wheels for distribution
+set -o errexit
+set -o nounset
+set -o pipefail
+
+BASE=$(realpath $(dirname $0))
+BUILD=${BASE}/_build
+VENV=${BUILD}/venv
+WHEEL_DIR=${BASE}/wheels
+REQUIREMENTS=${BASE}/requirements_tmp.txt
+REQUIREMENTS_FIXED=${BASE}/requirements.txt
+
+PIP=${VENV}/bin/pip
+
+mkdir -p $VENV
+virtualenv --python python3 $VENV || /bin/true
+$PIP install -r $REQUIREMENTS
+$PIP freeze --local --requirement $REQUIREMENTS_FIXED > $REQUIREMENTS_FIXED
+# https://github.com/pypa/pip/issues/4668
+sed -i '/pkg-resources==0.0.0/d' $REQUIREMENTS_FIXED
+$PIP install wheel
+$PIP wheel --find-links $WHEEL_DIR \
+   --wheel-dir $WHEEL_DIR \
+   --requirement $REQUIREMENTS_FIXED
+
diff --git a/requirements.txt b/requirements_tmp.txt
similarity index 100%
rename from requirements.txt
rename to requirements_tmp.txt

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8221aea361c961d7061c71afa31a2a4936a629db
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: PostgresSQL, add support for stretch and PG9.6

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389657 )

Change subject: PostgresSQL, add support for stretch and PG9.6
..

PostgresSQL, add support for stretch and PG9.6

Change-Id: I92bdf10814e1ca0a92306699f3f68302e5f02672
---
M modules/postgresql/manifests/dirs.pp
M modules/postgresql/manifests/master.pp
M modules/postgresql/manifests/postgis.pp
M modules/postgresql/manifests/server.pp
M modules/postgresql/manifests/slave.pp
M modules/postgresql/manifests/user.pp
6 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/389657/1

diff --git a/modules/postgresql/manifests/dirs.pp 
b/modules/postgresql/manifests/dirs.pp
index 4af5956..5d6cae1 100644
--- a/modules/postgresql/manifests/dirs.pp
+++ b/modules/postgresql/manifests/dirs.pp
@@ -25,6 +25,7 @@
 #
 class postgresql::dirs(
 $pgversion= $::lsbdistcodename ? {
+'stretch' => '9.6',
 'jessie'  => '9.4',
 'trusty'  => '9.3',
 },
diff --git a/modules/postgresql/manifests/master.pp 
b/modules/postgresql/manifests/master.pp
index 0708f4d..dc42a64 100644
--- a/modules/postgresql/manifests/master.pp
+++ b/modules/postgresql/manifests/master.pp
@@ -38,6 +38,7 @@
 $master_server=$::fqdn,
 $includes=[],
 $pgversion = $::lsbdistcodename ? {
+'stretch' => '9.6',
 'jessie'  => '9.4',
 'trusty'  => '9.3',
 },
diff --git a/modules/postgresql/manifests/postgis.pp 
b/modules/postgresql/manifests/postgis.pp
index b553ac8..e0e7286 100644
--- a/modules/postgresql/manifests/postgis.pp
+++ b/modules/postgresql/manifests/postgis.pp
@@ -15,6 +15,7 @@
 class postgresql::postgis(
 $ensure = 'present',
 $postgresql_postgis_package = $::lsbdistcodename ? {
+'stretch' => 'postgresql-9.6-postgis-2.3',
 'jessie'  => 'postgresql-9.4-postgis-2.3',
 'trusty'  => 'postgresql-9.3-postgis-2.1',
 },
diff --git a/modules/postgresql/manifests/server.pp 
b/modules/postgresql/manifests/server.pp
index 3aaf37e..72aaf3d 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -28,6 +28,7 @@
 #
 class postgresql::server(
 $pgversion= $::lsbdistcodename ? {
+'stretch' => '9.6',
 'jessie'  => '9.4',
 'trusty'  => '9.3',
 },
diff --git a/modules/postgresql/manifests/slave.pp 
b/modules/postgresql/manifests/slave.pp
index df9c1fb..b334bb1 100644
--- a/modules/postgresql/manifests/slave.pp
+++ b/modules/postgresql/manifests/slave.pp
@@ -33,6 +33,7 @@
 $replication_pass,
 $includes=[],
 $pgversion = $::lsbdistcodename ? {
+'stretch' => '9.6',
 'jessie'  => '9.4',
 'trusty'  => '9.3',
 },
diff --git a/modules/postgresql/manifests/user.pp 
b/modules/postgresql/manifests/user.pp
index 8bae59c..6217a2c 100644
--- a/modules/postgresql/manifests/user.pp
+++ b/modules/postgresql/manifests/user.pp
@@ -32,6 +32,7 @@
 $method = 'md5',
 $cidr = '127.0.0.1/32',
 $pgversion = $::lsbdistcodename ? {
+'stretch' => '9.6',
 'jessie'  => '9.4',
 'trusty'  => '9.3',
 },

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/private[master]: Add non-secret password for netbox DB replication

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389654 )

Change subject: Add non-secret password for netbox DB replication
..


Add non-secret password for netbox DB replication

Change-Id: I2db8efb3b3d5676fb0ae90954251fec8a0e87a08
---
M modules/passwords/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index e4e9274..136aa7e 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -507,4 +507,5 @@
 class passwords::netbox {
 $db_password = 'notsecret'
 $secret_key = 'notsecret'
+$replication_password = 'notsecret'
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2db8efb3b3d5676fb0ae90954251fec8a0e87a08
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/private[master]: Add non-secret password for netbox DB replication

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/389654 )

Change subject: Add non-secret password for netbox DB replication
..

Add non-secret password for netbox DB replication

Change-Id: I2db8efb3b3d5676fb0ae90954251fec8a0e87a08
---
M modules/passwords/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/54/389654/1

diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index e4e9274..136aa7e 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -507,4 +507,5 @@
 class passwords::netbox {
 $db_password = 'notsecret'
 $secret_key = 'notsecret'
+$replication_password = 'notsecret'
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2db8efb3b3d5676fb0ae90954251fec8a0e87a08
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: uwsgi: fix dependency for stretch

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/388750 )

Change subject: uwsgi: fix dependency for stretch
..


uwsgi: fix dependency for stretch

Change-Id: Ie10a5977eab24c893f0a03f0c15429515f74fa2c
---
M modules/uwsgi/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Ayounsi: Looks good to me, approved



diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index 6de63a0..8d9eff2 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -8,8 +8,10 @@
 # There are 30+ uWSGI plug-ins, installable via the dependency package
 # 'uwsgi-plugins-all'. But I'm going to go out on a limb here and predict
 # that we won't use any except these two.  -- OL
-if os_version('debian >= jessie') {
+if os_version('debian == jessie') {
 $plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-python3', 
'uwsgi-plugin-rack-ruby2.1' ]
+} elsif os_version('debian >= stretch') {
+$plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-python3', 
'uwsgi-plugin-rack-ruby2.3' ]
 } else {
 $plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-python3', 
'uwsgi-plugin-rack-ruby1.9.1' ]
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie10a5977eab24c893f0a03f0c15429515f74fa2c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: uwsgi: fix dependency for stretch

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/388750 )

Change subject: uwsgi: fix dependency for stretch
..

uwsgi: fix dependency for stretch

Change-Id: Ie10a5977eab24c893f0a03f0c15429515f74fa2c
---
M modules/uwsgi/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/388750/1

diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index 6de63a0..8d9eff2 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -8,8 +8,10 @@
 # There are 30+ uWSGI plug-ins, installable via the dependency package
 # 'uwsgi-plugins-all'. But I'm going to go out on a limb here and predict
 # that we won't use any except these two.  -- OL
-if os_version('debian >= jessie') {
+if os_version('debian == jessie') {
 $plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-python3', 
'uwsgi-plugin-rack-ruby2.1' ]
+} elsif os_version('debian >= stretch') {
+$plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-python3', 
'uwsgi-plugin-rack-ruby2.3' ]
 } else {
 $plugins = [ 'uwsgi-plugin-python', 'uwsgi-plugin-python3', 
'uwsgi-plugin-rack-ruby1.9.1' ]
 }

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Remove old migrate line

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/388622 )

Change subject: Remove old migrate line
..

Remove old migrate line

Change-Id: I84d1a1c90e9fdb4f38f24b61c7e13b0da50992d7
---
M scap/checks/netbox_setup.sh
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/netbox-deploy 
refs/changes/22/388622/1

diff --git a/scap/checks/netbox_setup.sh b/scap/checks/netbox_setup.sh
index 0d2b349..99cb6ee 100644
--- a/scap/checks/netbox_setup.sh
+++ b/scap/checks/netbox_setup.sh
@@ -9,7 +9,6 @@
 PYTHON=${VENV}/bin/python3
 
 # Run database migration
-python3 manage.py migrate
 ${PYTHON} ${NETBOX_ROOT}/netbox/manage.py migrate
 
 # Collect static files

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84d1a1c90e9fdb4f38f24b61c7e13b0da50992d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Remove old migrate line

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/388622 )

Change subject: Remove old migrate line
..


Remove old migrate line

Change-Id: I84d1a1c90e9fdb4f38f24b61c7e13b0da50992d7
---
M scap/checks/netbox_setup.sh
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/scap/checks/netbox_setup.sh b/scap/checks/netbox_setup.sh
index 0d2b349..99cb6ee 100644
--- a/scap/checks/netbox_setup.sh
+++ b/scap/checks/netbox_setup.sh
@@ -9,7 +9,6 @@
 PYTHON=${VENV}/bin/python3
 
 # Run database migration
-python3 manage.py migrate
 ${PYTHON} ${NETBOX_ROOT}/netbox/manage.py migrate
 
 # Collect static files

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84d1a1c90e9fdb4f38f24b61c7e13b0da50992d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Update checks scripts to reflect netbox location

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/388575 )

Change subject: Update checks scripts to reflect netbox location
..

Update checks scripts to reflect netbox location

Change-Id: I9c6baf5499e04cd29daa1afad568b83a92c25f58
---
M scap/checks/netbox_setup.sh
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/netbox-deploy 
refs/changes/75/388575/1

diff --git a/scap/checks/netbox_setup.sh b/scap/checks/netbox_setup.sh
index f78d6fb..0d2b349 100644
--- a/scap/checks/netbox_setup.sh
+++ b/scap/checks/netbox_setup.sh
@@ -5,11 +5,12 @@
 set -o pipefail
 
 VENV=/srv/deployment/netbox/venv
-NETBOX_ROOT=/srv/deployment/netbox/netbox
+NETBOX_ROOT=/srv/deployment/netbox/deploy/netbox
 PYTHON=${VENV}/bin/python3
 
 # Run database migration
 python3 manage.py migrate
+${PYTHON} ${NETBOX_ROOT}/netbox/manage.py migrate
 
 # Collect static files
 ${PYTHON} ${NETBOX_ROOT}/netbox/manage.py collectstatic --no-input

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c6baf5499e04cd29daa1afad568b83a92c25f58
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Update checks scripts to reflect netbox location

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/388575 )

Change subject: Update checks scripts to reflect netbox location
..


Update checks scripts to reflect netbox location

Change-Id: I9c6baf5499e04cd29daa1afad568b83a92c25f58
---
M scap/checks/netbox_setup.sh
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/scap/checks/netbox_setup.sh b/scap/checks/netbox_setup.sh
index f78d6fb..0d2b349 100644
--- a/scap/checks/netbox_setup.sh
+++ b/scap/checks/netbox_setup.sh
@@ -5,11 +5,12 @@
 set -o pipefail
 
 VENV=/srv/deployment/netbox/venv
-NETBOX_ROOT=/srv/deployment/netbox/netbox
+NETBOX_ROOT=/srv/deployment/netbox/deploy/netbox
 PYTHON=${VENV}/bin/python3
 
 # Run database migration
 python3 manage.py migrate
+${PYTHON} ${NETBOX_ROOT}/netbox/manage.py migrate
 
 # Collect static files
 ${PYTHON} ${NETBOX_ROOT}/netbox/manage.py collectstatic --no-input

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c6baf5499e04cd29daa1afad568b83a92c25f58
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Init submodules

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/388574 )

Change subject: Init submodules
..


Init submodules

Change-Id: I095c4988f8e25c5d39cab5373bf6eb3ea62c6ad6
---
M .gitmodules
A netbox
A wheels
3 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
index 1491d5b..73b6509 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
url = https://gerrit.wikimedia.org/r/operations/software/netbox
 [submodule "wheels"]
path = wheels
-  url = https://gerrit.wikimedia.org/r/operations/wheels/netbox
+   url = https://gerrit.wikimedia.org/r/operations/wheels/netbox
diff --git a/netbox b/netbox
new file mode 16
index 000..97d89e4
--- /dev/null
+++ b/netbox
@@ -0,0 +1 @@
+Subproject commit 97d89e48f481f25c0c12101eb67e67ae31db5808
diff --git a/wheels b/wheels
new file mode 16
index 000..435e746
--- /dev/null
+++ b/wheels
@@ -0,0 +1 @@
+Subproject commit 435e746abe26c32ff9a5ff7c3d5b068dc2c1cd2e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I095c4988f8e25c5d39cab5373bf6eb3ea62c6ad6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Init submodules

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/388574 )

Change subject: Init submodules
..

Init submodules

Change-Id: I095c4988f8e25c5d39cab5373bf6eb3ea62c6ad6
---
M .gitmodules
A netbox
A wheels
3 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/netbox-deploy 
refs/changes/74/388574/1

diff --git a/.gitmodules b/.gitmodules
index 1491d5b..73b6509 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
url = https://gerrit.wikimedia.org/r/operations/software/netbox
 [submodule "wheels"]
path = wheels
-  url = https://gerrit.wikimedia.org/r/operations/wheels/netbox
+   url = https://gerrit.wikimedia.org/r/operations/wheels/netbox
diff --git a/netbox b/netbox
new file mode 16
index 000..97d89e4
--- /dev/null
+++ b/netbox
@@ -0,0 +1 @@
+Subproject commit 97d89e48f481f25c0c12101eb67e67ae31db5808
diff --git a/wheels b/wheels
new file mode 16
index 000..435e746
--- /dev/null
+++ b/wheels
@@ -0,0 +1 @@
+Subproject commit 435e746abe26c32ff9a5ff7c3d5b068dc2c1cd2e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I095c4988f8e25c5d39cab5373bf6eb3ea62c6ad6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Netbox scap3 initial commit

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387861 )

Change subject: Netbox scap3 initial commit
..


Netbox scap3 initial commit

Change-Id: I6f3f202d01565c37c837d58980a3e6c7f2fe37cf
---
A .gitmodules
A .gitreview
A requirements.txt
A scap/checks.yaml
A scap/checks/netbox_setup.sh
A scap/checks/virtualenv.sh
A scap/scap.cfg
7 files changed, 76 insertions(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..1491d5b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "netbox"]
+   path = netbox
+   url = https://gerrit.wikimedia.org/r/operations/software/netbox
+[submodule "wheels"]
+   path = wheels
+  url = https://gerrit.wikimedia.org/r/operations/wheels/netbox
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..5ba8f81
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/software/netbox-deploy.git
+defaultbranch=master
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000..f601d76
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+-r netbox/requirements.txt
+napalm
+django-auth-ldap
diff --git a/scap/checks.yaml b/scap/checks.yaml
new file mode 100644
index 000..8ab2b6d
--- /dev/null
+++ b/scap/checks.yaml
@@ -0,0 +1,15 @@
+---
+checks:
+  virtualenv:
+type: command
+stage: promote
+timeout: 300
+group: default
+command: bash /srv/deployment/netbox/deploy/scap/checks/virtualenv.sh
+
+  netbox_setup:
+type: command
+stage: promote
+timeout: 300
+group: default
+command: bash /srv/deployment/netbox/deploy/scap/checks/netbox_setup.sh
diff --git a/scap/checks/netbox_setup.sh b/scap/checks/netbox_setup.sh
new file mode 100644
index 000..f78d6fb
--- /dev/null
+++ b/scap/checks/netbox_setup.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+VENV=/srv/deployment/netbox/venv
+NETBOX_ROOT=/srv/deployment/netbox/netbox
+PYTHON=${VENV}/bin/python3
+
+# Run database migration
+python3 manage.py migrate
+
+# Collect static files
+${PYTHON} ${NETBOX_ROOT}/netbox/manage.py collectstatic --no-input
diff --git a/scap/checks/virtualenv.sh b/scap/checks/virtualenv.sh
new file mode 100644
index 000..b55f9b4
--- /dev/null
+++ b/scap/checks/virtualenv.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Create/update a python virtualenv using the wheel binaries
+set -o errexit
+set -o nounset
+set -o pipefail
+
+VENV=/srv/deployment/netbox/venv
+DEPLOY_DIR=/srv/deployment/netbox/deploy
+WHEEL_DIR=${DEPLOY_DIR}/wheels
+REQUIREMENTS=${DEPLOY_DIR}/requirements.txt
+
+PIP=${VENV}/bin/pip
+
+# Ensure that the virtual environment exists
+mkdir -p $VENV
+virtualenv --python python3 $VENV || /bin/true
+
+# Install or upgrade all requirements from wheel cache
+$PIP install \
+--no-index \
+--find-links ${WHEEL_DIR} \
+--upgrade \
+--force-reinstall \
+--requirement $REQUIREMENTS
diff --git a/scap/scap.cfg b/scap/scap.cfg
new file mode 100644
index 000..7605cb0
--- /dev/null
+++ b/scap/scap.cfg
@@ -0,0 +1,8 @@
+[global]
+git_repo: netbox/deploy
+ssh_user: deploy-librenms
+server_groups: default
+dsh_targets: /etc/dsh/group/librenms
+git_submodules: True
+max_failures: 1
+keyholder_key: deploy_librenms

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f3f202d01565c37c837d58980a3e6c7f2fe37cf
Gerrit-PatchSet: 3
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Thcipriani 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: add codfw host to the list of librenms hosts

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/388462 )

Change subject: Scap: add codfw host to the list of librenms hosts
..

Scap: add codfw host to the list of librenms hosts

Change-Id: Ia718151782790260ae18ac0a6927e6ef7dd771b5
---
M hieradata/common/scap/dsh.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/388462/1

diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index e514b02..aecfa1a 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -89,6 +89,7 @@
   librenms:
 hosts:
   - netmon1002.wikimedia.org
+  - netmon2001.wikimedia.org
   logstash:
 hosts:
   - {'cluster': 'logstash', 'service': 'logstash'}

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: update AS#, add eqsin

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/388186 )

Change subject: LibreNMS: update AS#, add eqsin
..


LibreNMS: update AS#, add eqsin

Change-Id: I4b59b0efa7bd84672f8d6d64d4965279a33b9ded
---
M modules/role/manifests/librenms.pp
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/librenms.pp 
b/modules/role/manifests/librenms.pp
index 56164c6..886b0f5 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -67,14 +67,18 @@
 'eqord' => 'Equinix, Chicago, Illinois, USA',
 'knams' => 'Vancis, Amsterdam, The Netherlands',
 'esams' => 'EvoSwitch, Amsterdam, The Netherlands',
+'eqsin' => 'Equinix, Singapore',
 },
 'astext'   => {
 '64600' => 'PyBal',
 '64601' => 'Kubernetes',
+'64602' => 'Kubernetes',
+'64603' => 'Kubernetes',
 '64700' => 'frack-eqiad',
 '64701' => 'frack-codfw',
 '65001' => 'confed-eqiad-eqord',
 '65002' => 'confed-eqdfw-codfw',
+'65003' => 'confed-esams',
 '65004' => 'confed-ulsfo',
 '65517' => 'Equinix',
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b59b0efa7bd84672f8d6d64d4965279a33b9ded
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: update AS#, add eqsin

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/388186 )

Change subject: LibreNMS: update AS#, add eqsin
..

LibreNMS: update AS#, add eqsin

Change-Id: I4b59b0efa7bd84672f8d6d64d4965279a33b9ded
---
M modules/role/manifests/librenms.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/388186/1

diff --git a/modules/role/manifests/librenms.pp 
b/modules/role/manifests/librenms.pp
index 56164c6..886b0f5 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -67,14 +67,18 @@
 'eqord' => 'Equinix, Chicago, Illinois, USA',
 'knams' => 'Vancis, Amsterdam, The Netherlands',
 'esams' => 'EvoSwitch, Amsterdam, The Netherlands',
+'eqsin' => 'Equinix, Singapore',
 },
 'astext'   => {
 '64600' => 'PyBal',
 '64601' => 'Kubernetes',
+'64602' => 'Kubernetes',
+'64603' => 'Kubernetes',
 '64700' => 'frack-eqiad',
 '64701' => 'frack-codfw',
 '65001' => 'confed-eqiad-eqord',
 '65002' => 'confed-eqdfw-codfw',
+'65003' => 'confed-esams',
 '65004' => 'confed-ulsfo',
 '65517' => 'Equinix',
 },

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix two Jenkins tests errors in site.pp

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/388167 )

Change subject: Fix two Jenkins tests errors in site.pp
..


Fix two Jenkins tests errors in site.pp

 - manifests/site.pp:2058 ERROR two-space soft tabs not used
(2sp_soft_tabs)
 - manifests/site.pp:2075 ERROR two-space soft tabs not used
(2sp_soft_tabs)

Change-Id: Iacf86d69bc0349eba3eb90355f4304cd4816d5fa
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Ayounsi: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index eb41c45..f928eca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2055,7 +2055,7 @@
 
 node /^prometheus200[34]\.codfw\.wmnet$/ {
 role(prometheus::ops, prometheus::global, prometheus::services, 
prometheus::analytics,
- prometheus::k8s)
+  prometheus::k8s)
 
 include ::base::firewall
 include ::standard
@@ -2072,7 +2072,7 @@
 
 node /^prometheus100[34]\.eqiad\.wmnet$/ {
 role(prometheus::ops, prometheus::global, prometheus::services, 
prometheus::analytics,
- prometheus::k8s)
+  prometheus::k8s)
 
 include ::lvs::realserver
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacf86d69bc0349eba3eb90355f4304cd4816d5fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix two Jenkins tests errors in site.pp

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/388167 )

Change subject: Fix two Jenkins tests errors in site.pp
..

Fix two Jenkins tests errors in site.pp

 - manifests/site.pp:2058 ERROR two-space soft tabs not used
(2sp_soft_tabs)
 - manifests/site.pp:2075 ERROR two-space soft tabs not used
(2sp_soft_tabs)

Change-Id: Iacf86d69bc0349eba3eb90355f4304cd4816d5fa
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/388167/1

diff --git a/manifests/site.pp b/manifests/site.pp
index eb41c45..f928eca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2055,7 +2055,7 @@
 
 node /^prometheus200[34]\.codfw\.wmnet$/ {
 role(prometheus::ops, prometheus::global, prometheus::services, 
prometheus::analytics,
- prometheus::k8s)
+  prometheus::k8s)
 
 include ::base::firewall
 include ::standard
@@ -2072,7 +2072,7 @@
 
 node /^prometheus100[34]\.eqiad\.wmnet$/ {
 role(prometheus::ops, prometheus::global, prometheus::services, 
prometheus::analytics,
- prometheus::k8s)
+  prometheus::k8s)
 
 include ::lvs::realserver
 

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/private[master]: Add fake keys for Netbox deployment

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387878 )

Change subject: Add fake keys for Netbox deployment
..


Add fake keys for Netbox deployment

Change-Id: I759e6ae6749e8fb448989b7ee0089e4a4eeeb250
---
M modules/passwords/manifests/init.pp
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index db1b0a0..ab4e6f7 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -502,3 +502,8 @@
 class passwords::rddmarc {
 $db_password = 'notsecret'
 }
+
+class passwords::netbox {
+$db_password = 'notsecret'
+$secret_key = 'notsecret'
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I759e6ae6749e8fb448989b7ee0089e4a4eeeb250
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Netbox: initial puppet commit

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387880 )

Change subject: Netbox: initial puppet commit
..

Netbox: initial puppet commit

Change-Id: Ia3354fcf251952a27d58eba3487043d8d4bd26fe
---
M hieradata/role/common/deployment_server.yaml
M manifests/site.pp
A modules/netbox/manifests/init.pp
A modules/netbox/templates/configuration.py.erb
A modules/netbox/templates/gunicorn.erb
A modules/netbox/templates/ldap_config.py.erb
A modules/profile/manifests/netbox.pp
A modules/role/manifests/netbox.pp
A modules/role/templates/netbox/netbox.wikimedia.org.erb
9 files changed, 366 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/387880/1

diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 8eac2e3..865799c 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -173,6 +173,9 @@
   # Librenms software
   librenms/librenms:
 repository: operations/software/librenms
+  # Netbox software
+  netbox/deploy:
+repository: operations/software/netbox-deploy
   relforge/mjolnir:
 repository: search/MjoLniR
   statsv/statsv:
diff --git a/manifests/site.pp b/manifests/site.pp
index 0861aed..091fab0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1954,7 +1954,7 @@
 
 # network monitoring tools, stretch (T125020, T166180)
 node /^netmon(1002|2001)\.wikimedia\.org$/ {
-role(network::monitor, librenms, rancid, smokeping)
+role(network::monitor, librenms, rancid, smokeping, netbox)
 interface::add_ip6_mapped { 'main': }
 }
 
diff --git a/modules/netbox/manifests/init.pp b/modules/netbox/manifests/init.pp
new file mode 100644
index 000..d2b073f
--- /dev/null
+++ b/modules/netbox/manifests/init.pp
@@ -0,0 +1,58 @@
+# == Class: netbox::base
+#
+# Installs Netbox
+#
+class netbox(
+$secret_key,
+$ldap_password,
+$db_password,
+$debug=false,
+$port=8001,
+$config_path = '/srv/deployment/netbox/deploy',
+$venv_path = '/srv/deployment/netbox/venv',
+$directory = '/srv/deployment/netbox/netbox'
+$ensure='present',
+
+) {
+
+require_package('virtualenv', 'python3-dev',
+'gunicorn', 'libldap2-dev',
+'build-essential', 'python3-pip',
+'libsasl2-dev', 'libssl-dev')
+
+# If new install, postgres user needs to be manually added, see:
+# 
http://netbox.readthedocs.io/en/stable/installation/postgresql/#database-creation
+require_package('postgresql', 'libpq-dev')
+
+}
+
+file { "${directory}/netbox/netbox/configuration.py":
+ensure  => $ensure,
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => template('netbox/configuration.py.erb'),
+}
+
+file { "${directory}/netbox/netbox/ldap_config.py":
+ensure  => $ensure,
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => template('netbox/ldap_config.py.erb'),
+}
+
+service { 'gunicorn':
+ensure=> ensure_service($ensure),
+enable=> true,
+hasstatus => false,
+}
+
+file { '/etc/gunicorn.d/netbox':
+ensure  => $ensure,
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => template('netbox/gunicorn.erb'),
+require => Package['gunicorn'],
+}
diff --git a/modules/netbox/templates/configuration.py.erb 
b/modules/netbox/templates/configuration.py.erb
new file mode 100644
index 000..402e4c9
--- /dev/null
+++ b/modules/netbox/templates/configuration.py.erb
@@ -0,0 +1,145 @@
+#
+#   #
+#   Required settings   #
+#   #
+#
+
+# This is a list of valid fully-qualified domain names (FQDNs) for the NetBox 
server. NetBox will not permit write
+# access to the server via any other hostnames. The first FQDN in the list 
will be treated as the preferred name.
+#
+# Example: ALLOWED_HOSTS = ['netbox.example.com', 'netbox.internal.local']
+# We are behind an apache httpd server, so use X-Forwarded_Host header
+USE_X_FORWARDED_HOST = True
+ALLOWED_HOSTS = ['netbox.wikimedia.org']
+
+# PostgreSQL database configuration.
+DATABASE = {
+'NAME': 'netbox', # Database name
+'USER': 'netbox',   # PostgreSQL username
+'PASSWORD': '<%= @db_password %>',   # PostgreSQL password
+'HOST': 'localhost',  # Database server
+'PORT': '',   # Database port (leave blank for default)
+}
+
+# This key is used for secure generation of random numbers and strings. It 
must never be exposed outside of this file.
+# For optimal security, SECRET_KEY should be at least 50 characters in length 
and contain a mix of letters, numbers, and
+# symbols. NetBox will not run without this defined. For more information, see
+# 

[MediaWiki-commits] [Gerrit] labs/private[master]: Add fake keys for Netbox deployment

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387878 )

Change subject: Add fake keys for Netbox deployment
..

Add fake keys for Netbox deployment

Change-Id: I759e6ae6749e8fb448989b7ee0089e4a4eeeb250
---
M modules/passwords/manifests/init.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/78/387878/1

diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index db1b0a0..ab4e6f7 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -502,3 +502,8 @@
 class passwords::rddmarc {
 $db_password = 'notsecret'
 }
+
+class passwords::netbox {
+$db_password = 'notsecret'
+$secret_key = 'notsecret'
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I759e6ae6749e8fb448989b7ee0089e4a4eeeb250
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox-deploy[master]: Netbox scap3 initial commit

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387861 )

Change subject: Netbox scap3 initial commit
..

Netbox scap3 initial commit

Change-Id: I6f3f202d01565c37c837d58980a3e6c7f2fe37cf
---
A .gitmodules
A .gitreview
A requirements.txt
A scap/checks.yaml
A scap/checks/netbox_setup.sh
A scap/checks/virtualenv.sh
A scap/scap.cfg
7 files changed, 77 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/netbox-deploy 
refs/changes/61/387861/1

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..1491d5b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "netbox"]
+   path = netbox
+   url = https://gerrit.wikimedia.org/r/operations/software/netbox
+[submodule "wheels"]
+   path = wheels
+  url = https://gerrit.wikimedia.org/r/operations/wheels/netbox
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..5ba8f81
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/software/netbox-deploy.git
+defaultbranch=master
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000..f601d76
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+-r netbox/requirements.txt
+napalm
+django-auth-ldap
diff --git a/scap/checks.yaml b/scap/checks.yaml
new file mode 100644
index 000..8ab2b6d
--- /dev/null
+++ b/scap/checks.yaml
@@ -0,0 +1,15 @@
+---
+checks:
+  virtualenv:
+type: command
+stage: promote
+timeout: 300
+group: default
+command: bash /srv/deployment/netbox/deploy/scap/checks/virtualenv.sh
+
+  netbox_setup:
+type: command
+stage: promote
+timeout: 300
+group: default
+command: bash /srv/deployment/netbox/deploy/scap/checks/netbox_setup.sh
diff --git a/scap/checks/netbox_setup.sh b/scap/checks/netbox_setup.sh
new file mode 100644
index 000..f78d6fb
--- /dev/null
+++ b/scap/checks/netbox_setup.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+VENV=/srv/deployment/netbox/venv
+NETBOX_ROOT=/srv/deployment/netbox/netbox
+PYTHON=${VENV}/bin/python3
+
+# Run database migration
+python3 manage.py migrate
+
+# Collect static files
+${PYTHON} ${NETBOX_ROOT}/netbox/manage.py collectstatic --no-input
diff --git a/scap/checks/virtualenv.sh b/scap/checks/virtualenv.sh
new file mode 100644
index 000..b55f9b4
--- /dev/null
+++ b/scap/checks/virtualenv.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Create/update a python virtualenv using the wheel binaries
+set -o errexit
+set -o nounset
+set -o pipefail
+
+VENV=/srv/deployment/netbox/venv
+DEPLOY_DIR=/srv/deployment/netbox/deploy
+WHEEL_DIR=${DEPLOY_DIR}/wheels
+REQUIREMENTS=${DEPLOY_DIR}/requirements.txt
+
+PIP=${VENV}/bin/pip
+
+# Ensure that the virtual environment exists
+mkdir -p $VENV
+virtualenv --python python3 $VENV || /bin/true
+
+# Install or upgrade all requirements from wheel cache
+$PIP install \
+--no-index \
+--find-links ${WHEEL_DIR} \
+--upgrade \
+--force-reinstall \
+--requirement $REQUIREMENTS
diff --git a/scap/scap.cfg b/scap/scap.cfg
new file mode 100644
index 000..22fef03
--- /dev/null
+++ b/scap/scap.cfg
@@ -0,0 +1,9 @@
+[global]
+git_repo: netbox/deploy
+git_deploy_dir: /srv/deployment
+ssh_user: deploy-librenms
+server_groups: default
+dsh_targets: /etc/dsh/group/librenms
+git_submodules: True
+batch_size: 1
+max_failures: 1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f3f202d01565c37c837d58980a3e6c7f2fe37cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/netbox-deploy
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox[master]: Add django ldap support wheels

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386757 )

Change subject: Add django ldap support wheels
..


Add django ldap support wheels

Change-Id: Ied723a6dfef3388cede66aa7afc91ab93c2eb668
---
A django_auth_ldap-1.2.16-py3-none-any.whl
A pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl
2 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/django_auth_ldap-1.2.16-py3-none-any.whl 
b/django_auth_ldap-1.2.16-py3-none-any.whl
new file mode 100644
index 000..a54b3c9
--- /dev/null
+++ b/django_auth_ldap-1.2.16-py3-none-any.whl
Binary files differ
diff --git a/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl 
b/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl
new file mode 100644
index 000..6c23971
--- /dev/null
+++ b/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied723a6dfef3388cede66aa7afc91ab93c2eb668
Gerrit-PatchSet: 1
Gerrit-Project: operations/wheels/netbox
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox[master]: Add django ldap support wheels

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386757 )

Change subject: Add django ldap support wheels
..

Add django ldap support wheels

Change-Id: Ied723a6dfef3388cede66aa7afc91ab93c2eb668
---
A django_auth_ldap-1.2.16-py3-none-any.whl
A pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/wheels/netbox 
refs/changes/57/386757/1

diff --git a/django_auth_ldap-1.2.16-py3-none-any.whl 
b/django_auth_ldap-1.2.16-py3-none-any.whl
new file mode 100644
index 000..a54b3c9
--- /dev/null
+++ b/django_auth_ldap-1.2.16-py3-none-any.whl
Binary files differ
diff --git a/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl 
b/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl
new file mode 100644
index 000..6c23971
--- /dev/null
+++ b/pyldap-2.4.37-cp35-cp35m-linux_x86_64.whl
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied723a6dfef3388cede66aa7afc91ab93c2eb668
Gerrit-PatchSet: 1
Gerrit-Project: operations/wheels/netbox
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox[master]: Adding wheels for Netbox v2.2.2 + napalm

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386703 )

Change subject: Adding wheels for Netbox v2.2.2 + napalm
..


Adding wheels for Netbox v2.2.2 + napalm

Change-Id: I3b925e7240390a2731ddbf37ea73d8326a2155c2
---
A Django-1.11.6-py2.py3-none-any.whl
A Jinja2-2.9.6-py2.py3-none-any.whl
A Markdown-2.6.9-py3-none-any.whl
A MarkupSafe-1.0-py3-none-any.whl
A Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl
A PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl
A PyYAML-3.12-cp35-cp35m-linux_x86_64.whl
A VyattaConfParser-0.5.1-py3-none-any.whl
A asn1crypto-0.23.0-py2.py3-none-any.whl
A bcrypt-3.1.4-cp35-cp35m-manylinux1_x86_64.whl
A certifi-2017.7.27.1-py2.py3-none-any.whl
A cffi-1.11.2-cp35-cp35m-manylinux1_x86_64.whl
A chainmap-1.0.2-py2.py3-none-any.whl
A chardet-3.0.4-py2.py3-none-any.whl
A coreapi-2.3.3-py2.py3-none-any.whl
A coreschema-0.0.4-py3-none-any.whl
A cryptography-2.1.2-cp35-cp35m-manylinux1_x86_64.whl
A django_cors_headers-2.1.0-py2.py3-none-any.whl
A django_debug_toolbar-1.8-py2.py3-none-any.whl
A django_filter-1.1.0-py2.py3-none-any.whl
A django_mptt-0.8.7-py2.py3-none-any.whl
A django_rest_swagger-2.1.2-py2.py3-none-any.whl
A django_tables2-1.13.0-py3-none-any.whl
A djangorestframework-3.7.1-py2.py3-none-any.whl
A future-0.16.0-py3-none-any.whl
A graphviz-0.8.1-py2.py3-none-any.whl
A idna-2.6-py2.py3-none-any.whl
A itypes-1.1.0-py3-none-any.whl
A jtextfsm-0.3.1-py3-none-any.whl
A junos_eznc-2.1.7-py2.py3-none-any.whl
A librouteros-1.0.4-py3-none-any.whl
A lxml-4.1.0-cp35-cp35m-manylinux1_x86_64.whl
A napalm-1.2.0-py3-none-any.whl
A napalm_base-0.25.0-py3-none-any.whl
A napalm_eos-0.6.1-py3-none-any.whl
A napalm_fortios-0.4.0-py3-none-any.whl
A napalm_ios-0.8.1-py3-none-any.whl
A napalm_iosxr-0.5.6-py3-none-any.whl
A napalm_junos-0.12.1-py3-none-any.whl
A napalm_nxos-0.7.1-py3-none-any.whl
A napalm_panos-0.4.0-py3-none-any.whl
A napalm_pluribus-0.5.1-py3-none-any.whl
A napalm_ros-0.2.2-py3-none-any.whl
A napalm_vyos-0.1.3-py3-none-any.whl
A natsort-5.1.0-py2.py3-none-any.whl
A ncclient-0.5.3-py3-none-any.whl
A netaddr-0.7.18-py2.py3-none-any.whl
A netaddr-0.7.19-py2.py3-none-any.whl
A netmiko-1.4.3-py3-none-any.whl
A olefile-0.44-py3-none-any.whl
A openapi_codec-1.3.2-py3-none-any.whl
A pan_python-0.12.0-py3-none-any.whl
A paramiko-2.3.1-py2.py3-none-any.whl
A psycopg2-2.7.3.2-cp35-cp35m-manylinux1_x86_64.whl
A pyIOSXR-0.52-py3-none-any.whl
A pyPluribus-0.3.1-py3-none-any.whl
A py_gfm-0.1.3-py2.py3-none-any.whl
A pyasn1-0.3.7-py2.py3-none-any.whl
A pycparser-2.18-py2.py3-none-any.whl
A pycryptodome-3.4.7-cp35-cp35m-linux_x86_64.whl
A pyeapi-0.8.1-py3-none-any.whl
A pyfg-0.50-py3-none-any.whl
A pynxos-0.0.3-py3-none-any.whl
A pyserial-3.4-py2.py3-none-any.whl
A pytz-2017.2-py2.py3-none-any.whl
A requests-2.18.4-py2.py3-none-any.whl
A requests_toolbelt-0.8.0-py2.py3-none-any.whl
A scp-0.10.2-py2.py3-none-any.whl
A setuptools-36.6.0-py2.py3-none-any.whl
A simplejson-3.11.1-py3-none-any.whl
A six-1.11.0-py2.py3-none-any.whl
A sqlparse-0.2.4-py2.py3-none-any.whl
A uritemplate-3.0.0-py2.py3-none-any.whl
A urllib3-1.22-py2.py3-none-any.whl
A xmltodict-0.11.0-py2.py3-none-any.whl
75 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/Django-1.11.6-py2.py3-none-any.whl 
b/Django-1.11.6-py2.py3-none-any.whl
new file mode 100644
index 000..7200c88
--- /dev/null
+++ b/Django-1.11.6-py2.py3-none-any.whl
Binary files differ
diff --git a/Jinja2-2.9.6-py2.py3-none-any.whl 
b/Jinja2-2.9.6-py2.py3-none-any.whl
new file mode 100644
index 000..9fb201e
--- /dev/null
+++ b/Jinja2-2.9.6-py2.py3-none-any.whl
Binary files differ
diff --git a/Markdown-2.6.9-py3-none-any.whl b/Markdown-2.6.9-py3-none-any.whl
new file mode 100644
index 000..e14321f
--- /dev/null
+++ b/Markdown-2.6.9-py3-none-any.whl
Binary files differ
diff --git a/MarkupSafe-1.0-py3-none-any.whl b/MarkupSafe-1.0-py3-none-any.whl
new file mode 100644
index 000..ad75747
--- /dev/null
+++ b/MarkupSafe-1.0-py3-none-any.whl
Binary files differ
diff --git a/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl 
b/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl
new file mode 100644
index 000..08054b4
--- /dev/null
+++ b/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl
Binary files differ
diff --git a/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl 
b/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl
new file mode 100644
index 000..7942b61
--- /dev/null
+++ b/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl
Binary files differ
diff --git a/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl 
b/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl
new file mode 100644
index 000..ecfab9c
--- /dev/null
+++ b/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl
Binary files differ
diff --git a/VyattaConfParser-0.5.1-py3-none-any.whl 
b/VyattaConfParser-0.5.1-py3-none-any.whl
new file mode 100644
index 000..6561e35
--- 

[MediaWiki-commits] [Gerrit] operations...netbox[master]: Adding wheels for Netbox v2.2.2 + napalm

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386703 )

Change subject: Adding wheels for Netbox v2.2.2 + napalm
..

Adding wheels for Netbox v2.2.2 + napalm

Change-Id: I3b925e7240390a2731ddbf37ea73d8326a2155c2
---
A Django-1.11.6-py2.py3-none-any.whl
A Jinja2-2.9.6-py2.py3-none-any.whl
A Markdown-2.6.9-py3-none-any.whl
A MarkupSafe-1.0-py3-none-any.whl
A Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl
A PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl
A PyYAML-3.12-cp35-cp35m-linux_x86_64.whl
A VyattaConfParser-0.5.1-py3-none-any.whl
A asn1crypto-0.23.0-py2.py3-none-any.whl
A bcrypt-3.1.4-cp35-cp35m-manylinux1_x86_64.whl
A certifi-2017.7.27.1-py2.py3-none-any.whl
A cffi-1.11.2-cp35-cp35m-manylinux1_x86_64.whl
A chainmap-1.0.2-py2.py3-none-any.whl
A chardet-3.0.4-py2.py3-none-any.whl
A coreapi-2.3.3-py2.py3-none-any.whl
A coreschema-0.0.4-py3-none-any.whl
A cryptography-2.1.2-cp35-cp35m-manylinux1_x86_64.whl
A django_cors_headers-2.1.0-py2.py3-none-any.whl
A django_debug_toolbar-1.8-py2.py3-none-any.whl
A django_filter-1.1.0-py2.py3-none-any.whl
A django_mptt-0.8.7-py2.py3-none-any.whl
A django_rest_swagger-2.1.2-py2.py3-none-any.whl
A django_tables2-1.13.0-py3-none-any.whl
A djangorestframework-3.7.1-py2.py3-none-any.whl
A future-0.16.0-py3-none-any.whl
A graphviz-0.8.1-py2.py3-none-any.whl
A idna-2.6-py2.py3-none-any.whl
A itypes-1.1.0-py3-none-any.whl
A jtextfsm-0.3.1-py3-none-any.whl
A junos_eznc-2.1.7-py2.py3-none-any.whl
A librouteros-1.0.4-py3-none-any.whl
A lxml-4.1.0-cp35-cp35m-manylinux1_x86_64.whl
A napalm-1.2.0-py3-none-any.whl
A napalm_base-0.25.0-py3-none-any.whl
A napalm_eos-0.6.1-py3-none-any.whl
A napalm_fortios-0.4.0-py3-none-any.whl
A napalm_ios-0.8.1-py3-none-any.whl
A napalm_iosxr-0.5.6-py3-none-any.whl
A napalm_junos-0.12.1-py3-none-any.whl
A napalm_nxos-0.7.1-py3-none-any.whl
A napalm_panos-0.4.0-py3-none-any.whl
A napalm_pluribus-0.5.1-py3-none-any.whl
A napalm_ros-0.2.2-py3-none-any.whl
A napalm_vyos-0.1.3-py3-none-any.whl
A natsort-5.1.0-py2.py3-none-any.whl
A ncclient-0.5.3-py3-none-any.whl
A netaddr-0.7.18-py2.py3-none-any.whl
A netaddr-0.7.19-py2.py3-none-any.whl
A netmiko-1.4.3-py3-none-any.whl
A olefile-0.44-py3-none-any.whl
A openapi_codec-1.3.2-py3-none-any.whl
A pan_python-0.12.0-py3-none-any.whl
A paramiko-2.3.1-py2.py3-none-any.whl
A psycopg2-2.7.3.2-cp35-cp35m-manylinux1_x86_64.whl
A pyIOSXR-0.52-py3-none-any.whl
A pyPluribus-0.3.1-py3-none-any.whl
A py_gfm-0.1.3-py2.py3-none-any.whl
A pyasn1-0.3.7-py2.py3-none-any.whl
A pycparser-2.18-py2.py3-none-any.whl
A pycryptodome-3.4.7-cp35-cp35m-linux_x86_64.whl
A pyeapi-0.8.1-py3-none-any.whl
A pyfg-0.50-py3-none-any.whl
A pynxos-0.0.3-py3-none-any.whl
A pyserial-3.4-py2.py3-none-any.whl
A pytz-2017.2-py2.py3-none-any.whl
A requests-2.18.4-py2.py3-none-any.whl
A requests_toolbelt-0.8.0-py2.py3-none-any.whl
A scp-0.10.2-py2.py3-none-any.whl
A setuptools-36.6.0-py2.py3-none-any.whl
A simplejson-3.11.1-py3-none-any.whl
A six-1.11.0-py2.py3-none-any.whl
A sqlparse-0.2.4-py2.py3-none-any.whl
A uritemplate-3.0.0-py2.py3-none-any.whl
A urllib3-1.22-py2.py3-none-any.whl
A xmltodict-0.11.0-py2.py3-none-any.whl
75 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/wheels/netbox 
refs/changes/03/386703/1

diff --git a/Django-1.11.6-py2.py3-none-any.whl 
b/Django-1.11.6-py2.py3-none-any.whl
new file mode 100644
index 000..7200c88
--- /dev/null
+++ b/Django-1.11.6-py2.py3-none-any.whl
Binary files differ
diff --git a/Jinja2-2.9.6-py2.py3-none-any.whl 
b/Jinja2-2.9.6-py2.py3-none-any.whl
new file mode 100644
index 000..9fb201e
--- /dev/null
+++ b/Jinja2-2.9.6-py2.py3-none-any.whl
Binary files differ
diff --git a/Markdown-2.6.9-py3-none-any.whl b/Markdown-2.6.9-py3-none-any.whl
new file mode 100644
index 000..e14321f
--- /dev/null
+++ b/Markdown-2.6.9-py3-none-any.whl
Binary files differ
diff --git a/MarkupSafe-1.0-py3-none-any.whl b/MarkupSafe-1.0-py3-none-any.whl
new file mode 100644
index 000..ad75747
--- /dev/null
+++ b/MarkupSafe-1.0-py3-none-any.whl
Binary files differ
diff --git a/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl 
b/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl
new file mode 100644
index 000..08054b4
--- /dev/null
+++ b/Pillow-4.3.0-cp35-cp35m-manylinux1_x86_64.whl
Binary files differ
diff --git a/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl 
b/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl
new file mode 100644
index 000..7942b61
--- /dev/null
+++ b/PyNaCl-1.1.2-cp35-cp35m-manylinux1_x86_64.whl
Binary files differ
diff --git a/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl 
b/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl
new file mode 100644
index 000..ecfab9c
--- /dev/null
+++ b/PyYAML-3.12-cp35-cp35m-linux_x86_64.whl
Binary files differ
diff --git a/VyattaConfParser-0.5.1-py3-none-any.whl 
b/VyattaConfParser-0.5.1-py3-none-any.whl
new file mode 100644

[MediaWiki-commits] [Gerrit] operations...netbox[master]: Adding .gitreview

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386700 )

Change subject: Adding .gitreview
..


Adding .gitreview

Change-Id: Ia115cbe90229d1c0090161c8ebed3e49566f5930
---
A .gitreview
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..d3c3800
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/wheels/netbox.git
+defaultbranch=master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia115cbe90229d1c0090161c8ebed3e49566f5930
Gerrit-PatchSet: 3
Gerrit-Project: operations/wheels/netbox
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...netbox[master]: Adding .gitreview

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386700 )

Change subject: Adding .gitreview
..

Adding .gitreview

Change-Id: Ia115cbe90229d1c0090161c8ebed3e49566f5930
---
A .gitreview
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/wheels/netbox 
refs/changes/00/386700/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..d3c3800
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/wheels/netbox.git
+defaultbranch=master

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia115cbe90229d1c0090161c8ebed3e49566f5930
Gerrit-PatchSet: 1
Gerrit-Project: operations/wheels/netbox
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update prod ssh key for user mholloway-shell

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386187 )

Change subject: Update prod ssh key for user mholloway-shell
..


Update prod ssh key for user mholloway-shell

Update with a new key using ed25519 per the requirements on Wikitech:
https://wikitech.wikimedia.org/wiki/Production_shell_access#SSH_Key_Requirements

Bug: T178897
Change-Id: I82f38fe8ea9c52320324c000363245185f5151e7
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 045739e..029e4c4 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1786,7 +1786,8 @@
 gid: 500
 name: mholloway-shell
 realname: Michael Holloway
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDASOBvfuYdsxYbKOH9NTGHkk6QiuGcQR2tMpGZ5kBcPK5mqb5zj0Qr9c/6o3EiTH+BYYnlvgp8zzAjzb2t1oCIn40kdvwp7Q3PIvuoaJj1rRFc0j2RMViUzxCOWeEf7v/28leQ3ZQKHB9p4l9wR3xcl5ZmGvD1JNFFL5hxBlScmMaOEadh5jSKMAJZQM2QjexoGkNp3M59G7CYryC8niQFhWwxGKaHy76ApSXadD6LrmwQmtA3zhRlnAdfBMh5heeutO7wRUE9xStAIMZpf2Pnq3L6ytRMvsr4kvknZ4QdHsNHVqjC/KoK73LIxDlu0HJYzlChaqQ1Xo+x68DU/Ct3
 mhollo...@wikimedia.org 2015-11-11]
+ssh_keys:
+  - ssh-ed25519 
C3NzaC1lZDI1NTE5IIneKTP+6PaLMgGkOqtGe89r1i6e8lAPSZuBgGSbJaFS 
mholloway@wmf1256.local
 uid: 11963
 email: mhollo...@wikimedia.org
   madhuvishy:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82f38fe8ea9c52320324c000363245185f5151e7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: Add legoktm's new ed25519 key

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384634 )

Change subject: admin: Add legoktm's new ed25519 key
..


admin: Add legoktm's new ed25519 key

Change-Id: I46e87e6b53bd3fa1bb7fd116f487bd2bc7621807
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 3f7d791..045739e 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1333,6 +1333,7 @@
 realname: Kunal Mehta
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDcTXNrkmB903Zj9nhqrQ6gW4WZ1UhaM67CpeaX7TDWRfArOscoD+ByXJdboZALxG1Of8kku0PfMrQWrtEiyLbpEdt3Y6mraTPwgx6eMu4juK+NkaJYRSQYkf+jxqheKWYYKjF1HK0I9SxnM4mrAKTMmjtp6X/6FQaAtDVa1rTQzlBEgYJIdl5Ik/pv2Py5dsYrgv3KXn9NBiOkdDiVgae26iGcpIi3Z6CA5fR8LRdRdP/GUjNJAF01pzlIMoMlh0Q1u+t6nUXWUBnUnogFU+hPAk/yq4XA9HZ7vADDKgeTyCzvSEMM7TcjElVgDwou9qhaleVxV7GXWpcVac1e9DlN
 lego...@wikimedia.org
+  - ssh-ed25519 
C3NzaC1lZDI1NTE5ILLgZDBO7XQCmYSuuwxMGnLO1w1Ceyo6o9QAwg4IhnnH 
lego...@wikimedia.org
 uid: 2552
 email: kme...@wikimedia.org
   howief:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46e87e6b53bd3fa1bb7fd116f487bd2bc7621807
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Reserve IPs for eqsin RIPE atlas

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386538 )

Change subject: Reserve IPs for eqsin RIPE atlas
..


Reserve IPs for eqsin RIPE atlas

Change-Id: I973751f740a99d4b897472b0bce4e81f33d4d40a
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
3 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 02486c4..ba02b4e 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -28,6 +28,8 @@
 ; 2001:0df2:e500:201::/64 - sandbox1-eqsin
 $ORIGIN 1.0.2.0.{{ zonename }}.
 
+0.2.0.0.6.6.1.0.2.0.1.0.3.0.1.0 1H IN PTR   ripe-atlas-eqsin.wikimedia.org.
+
 ; 2001:0df2:e500:ed1a::/64 - LVS Public Service IPs (allocated)
 ; - 2001:0df2:e500:ed1a::0:0/110 (::0:0 - ::3: -- LVS Public Service IPs 
(in use)
 ; -- 2001:0df2:e500:ed1a::0:0/111 (::0:0 - ::1: --- LVS high-traffic1 
(Text)
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index d2911ba..34bdc9c 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -18,6 +18,9 @@
 
 ; 103.102.166.0/28 (0-15) - public1-eqsin
 ; 103.102.166.16/28 (16-31) - sandbox1-eqsin
+
+20 1H IN PTR   ripe-atlas-eqsin.wikimedia.org.
+
 ; 103.102.166.32/27 (32-63) - unused
 ; 103.102.166.64/26 (64-127) - unused
 ; 103.102.166.128/27 (128-159) - Infrastructure Space
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1df29ba..ddde353 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -247,6 +247,8 @@
 ripe-atlas-esams 1H IN  2620:0:862:201:91:198:174:132
 ripe-atlas-ulsfo 1H IN A198.35.26.244
 ripe-atlas-ulsfo 1H IN  2620:0:863:201:198:35:26:244
+ripe-atlas-eqsin 1H IN A103.102.166.20
+ripe-atlas-eqsin 1H IN  2001:0df2:e500:201:103:102:166:20
 seaborgium  1H  IN A208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 serpens 1H  IN A208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver  1H  IN A208.80.154.136

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I973751f740a99d4b897472b0bce4e81f33d4d40a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Reserve IPs for eqsin RIPE atlas

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386538 )

Change subject: Reserve IPs for eqsin RIPE atlas
..

Reserve IPs for eqsin RIPE atlas

Change-Id: I973751f740a99d4b897472b0bce4e81f33d4d40a
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
3 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/38/386538/1

diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 02486c4..ba02b4e 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -28,6 +28,8 @@
 ; 2001:0df2:e500:201::/64 - sandbox1-eqsin
 $ORIGIN 1.0.2.0.{{ zonename }}.
 
+0.2.0.0.6.6.1.0.2.0.1.0.3.0.1.0 1H IN PTR   ripe-atlas-eqsin.wikimedia.org.
+
 ; 2001:0df2:e500:ed1a::/64 - LVS Public Service IPs (allocated)
 ; - 2001:0df2:e500:ed1a::0:0/110 (::0:0 - ::3: -- LVS Public Service IPs 
(in use)
 ; -- 2001:0df2:e500:ed1a::0:0/111 (::0:0 - ::1: --- LVS high-traffic1 
(Text)
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index d2911ba..34bdc9c 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -18,6 +18,9 @@
 
 ; 103.102.166.0/28 (0-15) - public1-eqsin
 ; 103.102.166.16/28 (16-31) - sandbox1-eqsin
+
+20 1H IN PTR   ripe-atlas-eqsin.wikimedia.org.
+
 ; 103.102.166.32/27 (32-63) - unused
 ; 103.102.166.64/26 (64-127) - unused
 ; 103.102.166.128/27 (128-159) - Infrastructure Space
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1df29ba..ddde353 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -247,6 +247,8 @@
 ripe-atlas-esams 1H IN  2620:0:862:201:91:198:174:132
 ripe-atlas-ulsfo 1H IN A198.35.26.244
 ripe-atlas-ulsfo 1H IN  2620:0:863:201:198:35:26:244
+ripe-atlas-eqsin 1H IN A103.102.166.20
+ripe-atlas-eqsin 1H IN  2001:0df2:e500:201:103:102:166:20
 seaborgium  1H  IN A208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 serpens 1H  IN A208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver  1H  IN A208.80.154.136

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I973751f740a99d4b897472b0bce4e81f33d4d40a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: eqsin revdns: strawman subnet plan

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/385402 )

Change subject: eqsin revdns: strawman subnet plan
..


eqsin revdns: strawman subnet plan

Bug: T156256
Change-Id: Ie3b68e5929a945efe2eebd58787f606eeedd294e
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/166.102.103.in-addr.arpa
3 files changed, 49 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index ab6bc01..02486c4 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -13,4 +13,32 @@
 1D  IN NS   ns1.wikimedia.org.
 1D  IN NS   ns2.wikimedia.org.
 
+; 2001:0df2:e500::/48
 ; APNIC space, reserved for eqsin
+
+; 2001:0df2:e500:0::/56 - eqsin public subnets
+; 2001:0df2:e500:1::/64 - public1-eqsin
+$ORIGIN 1.0.0.0.{{ zonename }}.
+
+; 2001:0df2:e500:100::/56 - eqsin private subnets
+; 2001:0df2:e500:101::/64 - private1-eqsin
+$ORIGIN 1.0.1.0.{{ zonename }}.
+
+; 2001:0df2:e500:200::/56 - eqsin sandbox subnets
+; 2001:0df2:e500:201::/64 - sandbox1-eqsin
+$ORIGIN 1.0.2.0.{{ zonename }}.
+
+; 2001:0df2:e500:ed1a::/64 - LVS Public Service IPs (allocated)
+; - 2001:0df2:e500:ed1a::0:0/110 (::0:0 - ::3: -- LVS Public Service IPs 
(in use)
+; -- 2001:0df2:e500:ed1a::0:0/111 (::0:0 - ::1: --- LVS high-traffic1 
(Text)
+$ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+; -- 2001:0df2:e500:ed1a::2:0/111 (::2:0 - ::3: --- LVS high-traffic2 
(Multimedia & Misc)
+$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+
+; 2001:0df2:e500:fe00::/56 - Infrastructure IPs
+$ORIGIN 0.0.e.f.{{ zonename }}.
+
+; 2001:0df2:e500:::/56 - Loopback IPs
+$ORIGIN f.f.f.f.{{ zonename }}.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 433371e..ce2c989 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2895,6 +2895,15 @@
 131 1H  IN PTR  cp4031.ulsfo.wmnet.
 132 1H  IN PTR  cp4032.ulsfo.wmnet.
 
+; EQSIN (10.132.0.0/16)
+; 10.132.0.0/16 - eqsin
+; 10.132.0.0/17 - eqsin private
+; 10.132.0.0/24 - private1-eqsin
+$ORIGIN 0.132.{{ zonename }}.
+; 10.132.128.0/17 - eqsin mgmt
+$ORIGIN 128.132.{{ zonename }}.
+$ORIGIN 129.132.{{ zonename }}.
+
 ;
 ; CODFW (10.192.0.0/12)
 ;
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index ab6bc01..d2911ba 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -13,4 +13,16 @@
 1D  IN NS   ns1.wikimedia.org.
 1D  IN NS   ns2.wikimedia.org.
 
+; 103.102.166.0/24 (103.102.166.0 - 103.102.166.255)
 ; APNIC space, reserved for eqsin
+
+; 103.102.166.0/28 (0-15) - public1-eqsin
+; 103.102.166.16/28 (16-31) - sandbox1-eqsin
+; 103.102.166.32/27 (32-63) - unused
+; 103.102.166.64/26 (64-127) - unused
+; 103.102.166.128/27 (128-159) - Infrastructure Space
+; 103.102.166.160/27 (160-191) - unused
+; 103.102.166.192/27 (192-223) - unused
+; 103.102.166.224/27 (224-255) - LVS Service IPs
+; - 103.102.166.224/28 (224-239) -- LVS high-traffic1 (Text)
+; - 103.102.166.240/28 (240-255) -- high-traffic2 (Multimedia & Misc)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3b68e5929a945efe2eebd58787f606eeedd294e
Gerrit-PatchSet: 6
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Fix interface numbers on esams/eqiad tunnel PTR

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386214 )

Change subject: Fix interface numbers on esams/eqiad tunnel PTR
..


Fix interface numbers on esams/eqiad tunnel PTR

Change-Id: I061d85ccebf2bea2ed9313a6e94c46d4d46c3e73
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 2b6f9f1..f629618 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -298,11 +298,11 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-4-2-0.cr2-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-1-1-0.cr1-eqord.wikimedia.org.
 
-; cr2-eqiad:gr-5/2/0.1 <--> cr2-esams:gr-0/0/0.1 (2620:0:861:fe03::/64)
+; cr2-eqiad:gr-4/3/0.1 <--> cr2-esams:gr-0/1/0.1 (2620:0:861:fe03::/64)
 
 $ORIGIN 3.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-0-0-0-1.cr2-esams.wikimedia.org.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-4-3-0-1.cr2-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-0-1-0-1.cr2-esams.wikimedia.org.
 
 ; cr1-eqiad <--> mr1-eqiad (2620:0:861:fe04::/64)
 
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 616a629..b9804a4 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -156,10 +156,10 @@
 
 219 1H  IN PTR  pfw3-eqiad.wikimedia.org.
 
-; 208.80.154.220/31 (cr2-eqiad:gr-5/2/0.1 <--> cr2-esams:gr-0/0/0.1)
+; 208.80.154.220/31 (cr2-eqiad:gr-4/3/0.1 <--> cr2-esams:gr-0/1/0.1)
 
-220 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
-221 1H IN PTR   gr-0-0-0-1.cr2-esams.wikimedia.org.
+220 1H IN PTR   gr-4-3-0-1.cr2-eqiad.wikimedia.org.
+221 1H IN PTR   gr-0-1-0-1.cr2-esams.wikimedia.org.
 
 ; 208.80.154.222/31 unused
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I061d85ccebf2bea2ed9313a6e94c46d4d46c3e73
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Fix interface numbers on esams/eqiad tunnel PTR

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386214 )

Change subject: Fix interface numbers on esams/eqiad tunnel PTR
..

Fix interface numbers on esams/eqiad tunnel PTR

Change-Id: I061d85ccebf2bea2ed9313a6e94c46d4d46c3e73
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/14/386214/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 2b6f9f1..f629618 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -298,11 +298,11 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-4-2-0.cr2-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-1-1-0.cr1-eqord.wikimedia.org.
 
-; cr2-eqiad:gr-5/2/0.1 <--> cr2-esams:gr-0/0/0.1 (2620:0:861:fe03::/64)
+; cr2-eqiad:gr-4/3/0.1 <--> cr2-esams:gr-0/1/0.1 (2620:0:861:fe03::/64)
 
 $ORIGIN 3.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-0-0-0-1.cr2-esams.wikimedia.org.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-4-3-0-1.cr2-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-0-1-0-1.cr2-esams.wikimedia.org.
 
 ; cr1-eqiad <--> mr1-eqiad (2620:0:861:fe04::/64)
 
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 616a629..b9804a4 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -156,10 +156,10 @@
 
 219 1H  IN PTR  pfw3-eqiad.wikimedia.org.
 
-; 208.80.154.220/31 (cr2-eqiad:gr-5/2/0.1 <--> cr2-esams:gr-0/0/0.1)
+; 208.80.154.220/31 (cr2-eqiad:gr-4/3/0.1 <--> cr2-esams:gr-0/1/0.1)
 
-220 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
-221 1H IN PTR   gr-0-0-0-1.cr2-esams.wikimedia.org.
+220 1H IN PTR   gr-4-3-0-1.cr2-eqiad.wikimedia.org.
+221 1H IN PTR   gr-0-1-0-1.cr2-esams.wikimedia.org.
 
 ; 208.80.154.222/31 unused
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I061d85ccebf2bea2ed9313a6e94c46d4d46c3e73
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Assigning v4/v6 IPs for eqiad/esams tunnel

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386119 )

Change subject: Assigning v4/v6 IPs for eqiad/esams tunnel
..


Assigning v4/v6 IPs for eqiad/esams tunnel

Change-Id: I31ec9d41493d7f5e63037dfa6803b26084cc5d7e
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
2 files changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 079c7bc..2b6f9f1 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -298,6 +298,12 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-4-2-0.cr2-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-1-1-0.cr1-eqord.wikimedia.org.
 
+; cr2-eqiad:gr-5/2/0.1 <--> cr2-esams:gr-0/0/0.1 (2620:0:861:fe03::/64)
+
+$ORIGIN 3.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-0-0-0-1.cr2-esams.wikimedia.org.
+
 ; cr1-eqiad <--> mr1-eqiad (2620:0:861:fe04::/64)
 
 $ORIGIN 4.0.e.f.{{ zonename }}.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 9bef1b9..616a629 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -156,7 +156,10 @@
 
 219 1H  IN PTR  pfw3-eqiad.wikimedia.org.
 
-; 208.80.154.220/31 unused
+; 208.80.154.220/31 (cr2-eqiad:gr-5/2/0.1 <--> cr2-esams:gr-0/0/0.1)
+
+220 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
+221 1H IN PTR   gr-0-0-0-1.cr2-esams.wikimedia.org.
 
 ; 208.80.154.222/31 unused
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31ec9d41493d7f5e63037dfa6803b26084cc5d7e
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Assigning v4/v6 IPs for eqiad/esams tunnel

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386119 )

Change subject: Assigning v4/v6 IPs for eqiad/esams tunnel
..

Assigning v4/v6 IPs for eqiad/esams tunnel

Change-Id: I31ec9d41493d7f5e63037dfa6803b26084cc5d7e
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
2 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/19/386119/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 079c7bc..2b6f9f1 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -298,6 +298,12 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-4-2-0.cr2-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-1-1-0.cr1-eqord.wikimedia.org.
 
+; cr2-eqiad:gr-5/2/0.1 <--> cr2-esams:gr-0/0/0.1 (2620:0:861:fe03::/64)
+
+$ORIGIN 3.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   gr-0-0-0-1.cr2-esams.wikimedia.org.
+
 ; cr1-eqiad <--> mr1-eqiad (2620:0:861:fe04::/64)
 
 $ORIGIN 4.0.e.f.{{ zonename }}.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 9bef1b9..616a629 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -156,7 +156,10 @@
 
 219 1H  IN PTR  pfw3-eqiad.wikimedia.org.
 
-; 208.80.154.220/31 unused
+; 208.80.154.220/31 (cr2-eqiad:gr-5/2/0.1 <--> cr2-esams:gr-0/0/0.1)
+
+220 1H IN PTR   gr-5-2-0-1.cr2-eqiad.wikimedia.org.
+221 1H IN PTR   gr-0-0-0-1.cr2-esams.wikimedia.org.
 
 ; 208.80.154.222/31 unused
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31ec9d41493d7f5e63037dfa6803b26084cc5d7e
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "Add DNS/IP allocations for ftp-internal"

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383640 )

Change subject: Revert "Add DNS/IP allocations for ftp-internal"
..


Revert "Add DNS/IP allocations for ftp-internal"

This reverts commit 79eae04e239f2727d818b92bab2f42762c3acb2a.

Change-Id: Ic3c4fd09cf5e9505c6b9054b7bb17bbc34b4dba1
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 305a41a..eec5a04 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -858,7 +858,7 @@
 176 1H IN PTR   hafnium.eqiad.wmnet.
 177 1H IN PTR   etherpad1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 178 1H IN PTR   restbase1008.eqiad.wmnet.
-179 1H IN PTR   ftp-internal.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
+
 180 1H IN PTR   conf1002.eqiad.wmnet.
 181 1H IN PTR   bromine.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 182 1H IN PTR   krypton.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
diff --git a/templates/wmnet b/templates/wmnet
index b286b99..043e22e 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -447,7 +447,6 @@
 eventlog10011H  IN  2620:0:861:103:10:64:32:167
 flerovium   1H  IN A10.64.48.112
 francium1H  IN A10.64.32.168
-ftp-internal1H  IN A10.64.32.179
 ganeti1001  1H  IN A10.64.32.169
 ganeti1002  1H  IN A10.64.32.170
 ganeti1003  1H  IN A10.64.32.171

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3c4fd09cf5e9505c6b9054b7bb17bbc34b4dba1
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "Add DNS/IP allocations for ftp-internal"

[Ayounsi (Code Review)]

Hello jenkins-bot, Dzahn,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/383640

to review the following change.


Change subject: Revert "Add DNS/IP allocations for ftp-internal"
..

Revert "Add DNS/IP allocations for ftp-internal"

This reverts commit 79eae04e239f2727d818b92bab2f42762c3acb2a.

Change-Id: Ic3c4fd09cf5e9505c6b9054b7bb17bbc34b4dba1
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/40/383640/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index fbf045c..021a3b8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -859,7 +859,7 @@
 176 1H IN PTR   hafnium.eqiad.wmnet.
 177 1H IN PTR   etherpad1001.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 178 1H IN PTR   restbase1008.eqiad.wmnet.
-179 1H IN PTR   ftp-internal.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
+
 180 1H IN PTR   conf1002.eqiad.wmnet.
 181 1H IN PTR   bromine.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 182 1H IN PTR   krypton.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
diff --git a/templates/wmnet b/templates/wmnet
index bbc8d0e..efeaae0 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -445,7 +445,6 @@
 eventlog10011H  IN  2620:0:861:103:10:64:32:167
 flerovium   1H  IN A10.64.48.112
 francium1H  IN A10.64.32.168
-ftp-internal1H  IN A10.64.32.179
 ganeti1001  1H  IN A10.64.32.169
 ganeti1002  1H  IN A10.64.32.170
 ganeti1003  1H  IN A10.64.32.171

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3c4fd09cf5e9505c6b9054b7bb17bbc34b4dba1
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Add DHCP entry for ftp-internal"

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383639 )

Change subject: Revert "Add DHCP entry for ftp-internal"
..


Revert "Add DHCP entry for ftp-internal"

This reverts commit 5d715e5c9241c27489b7f916c28abc64a4b21b0d.

Change-Id: I683bf4b442e770719f3e0280f8f71c8dcc6162d1
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 1 insertion(+), 7 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 6f0b2b9..db0a29e 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -146,13 +146,6 @@
 fixed-address fermium.wikimedia.org;
 }
 
-host ftp-internal {
-  hardware ethernet aa:00:00:3c:da:9f;
-  fixed-address ftp-internal.eqiad.wmnet;
-  option pxelinux.pathprefix "stretch-installer/";
-  filename "stretch-installer/debian-installer/amd64/pxelinux.0";
-}
-
 host hassaleh {
 hardware ethernet aa:00:00:3f:8c:a0;
 fixed-address hassaleh.codfw.wmnet;
@@ -399,3 +392,4 @@
 hardware ethernet aa:00:00:45:62:2d;
 fixed-address tureis.codfw.wmnet;
 }
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I683bf4b442e770719f3e0280f8f71c8dcc6162d1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Add DHCP entry for ftp-internal"

[Ayounsi (Code Review)]

Hello jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/383639

to review the following change.


Change subject: Revert "Add DHCP entry for ftp-internal"
..

Revert "Add DHCP entry for ftp-internal"

This reverts commit 5d715e5c9241c27489b7f916c28abc64a4b21b0d.

Change-Id: I683bf4b442e770719f3e0280f8f71c8dcc6162d1
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/383639/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 74ab995..d01dba3 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -146,13 +146,6 @@
 fixed-address fermium.wikimedia.org;
 }
 
-host ftp-internal {
-  hardware ethernet aa:00:00:3c:da:9f;
-  fixed-address ftp-internal.eqiad.wmnet;
-  option pxelinux.pathprefix "stretch-installer/";
-  filename "stretch-installer/debian-installer/amd64/pxelinux.0";
-}
-
 host hassaleh {
 hardware ethernet aa:00:00:3f:8c:a0;
 fixed-address hassaleh.codfw.wmnet;
@@ -392,3 +385,4 @@
 hardware ethernet aa:00:00:45:62:2d;
 fixed-address tureis.codfw.wmnet;
 }
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I683bf4b442e770719f3e0280f8f71c8dcc6162d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Add partman receipe for ftp-internal"

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383636 )

Change subject: Revert "Add partman receipe for ftp-internal"
..


Revert "Add partman receipe for ftp-internal"

This reverts commit 0dd3a024315064176d64da267df1caafe16a5015.

Change-Id: I42f19c6e365c8f66cd2e5bb682e1986d865452b2
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 39d81e5..49eafdf 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -81,7 +81,6 @@
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
 eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
 francium|tegmen) echo partman/raid10-gpt.cfg ;; \
-ftp-internal) echo partman/flat.cfg virtual.cfg ;; \
 
gerrit2001|labtestnet2002|labtestneutron2002|netmon1002|netmon2001|phab1001) 
echo partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 ganeti100[1-4]) echo partman/ganeti-raid1.cfg ;; \
 ganeti100[5-8]) echo partman/ganeti.cfg ;; \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42f19c6e365c8f66cd2e5bb682e1986d865452b2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Add ftp-internal to puppet"

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383633 )

Change subject: Revert "Add ftp-internal to puppet"
..


Revert "Add ftp-internal to puppet"

This reverts commit 1179cdba1abf205b1e1754d913377c789dcfce01.

PDU upgrade done, host not needed anymore.

Change-Id: I77df97f1b4e53a8ecc153a20b807dd2b66ecd372
---
M manifests/site.pp
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index c595a2d..b40d297 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -964,11 +964,6 @@
 role(dumps::web::htmldumps)
 }
 
-node 'ftp-internal.eqiad.wmnet' {
-# temp FTP server for T175342
-role(test)
-}
-
 # Virtualization hosts
 node /^ganeti[12]00[0-9]\.(codfw|eqiad)\.wmnet$/ {
 role(ganeti)

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Add partman receipe for ftp-internal"

[Ayounsi (Code Review)]

Hello jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/383636

to review the following change.


Change subject: Revert "Add partman receipe for ftp-internal"
..

Revert "Add partman receipe for ftp-internal"

This reverts commit 0dd3a024315064176d64da267df1caafe16a5015.

Change-Id: I42f19c6e365c8f66cd2e5bb682e1986d865452b2
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/383636/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 9414ebc..277d7a9 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -81,7 +81,6 @@
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
 eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
 francium|tegmen) echo partman/raid10-gpt.cfg ;; \
-ftp-internal) echo partman/flat.cfg virtual.cfg ;; \
 
gerrit2001|labtestnet2002|labtestneutron2002|netmon1002|netmon2001|phab1001) 
echo partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 ganeti100[1-4]) echo partman/ganeti-raid1.cfg ;; \
 ganeti100[5-8]) echo partman/ganeti.cfg ;; \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42f19c6e365c8f66cd2e5bb682e1986d865452b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Add ftp-internal to puppet"

[Ayounsi (Code Review)]

Hello jenkins-bot, Dzahn,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/383633

to review the following change.


Change subject: Revert "Add ftp-internal to puppet"
..

Revert "Add ftp-internal to puppet"

This reverts commit 1179cdba1abf205b1e1754d913377c789dcfce01.

PDU upgrade done, host not needed anymore.

Change-Id: I77df97f1b4e53a8ecc153a20b807dd2b66ecd372
---
M manifests/site.pp
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/383633/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a25a3b9..c91e21d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -960,11 +960,6 @@
 role(dumps::web::htmldumps)
 }
 
-node 'ftp-internal.eqiad.wmnet' {
-# temp FTP server for T175342
-role(test)
-}
-
 # Virtualization hosts
 node /^ganeti[12]00[0-9]\.(codfw|eqiad)\.wmnet$/ {
 role(ganeti)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77df97f1b4e53a8ecc153a20b807dd2b66ecd372
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: Depool esams for expected blips during ASN renumbering

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383382 )

Change subject: Depool esams for expected blips during ASN renumbering
..


Depool esams for expected blips during ASN renumbering

Bug: T167840
Change-Id: Ic055989a83141a8c7829389583d53f3896d8a4e0
---
M admin_state
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/admin_state b/admin_state
index 54ee433..4d7ce93 100644
--- a/admin_state
+++ b/admin_state
@@ -72,3 +72,6 @@
 ### v T164610 - semi-permanent to avoid confusion until T164609
 geoip/misc-addrs/ulsfo => DOWN
 ### ^ T164610 - semi-permanent to avoid confusion until T164609
+
+# esams AS renumbering - T167840
+geoip/generic-map/esams => DOWN

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic055989a83141a8c7829389583d53f3896d8a4e0
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add ftp-internal to puppet

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382623 )

Change subject: Add ftp-internal to puppet
..


Add ftp-internal to puppet

Change-Id: Id790f641c477ea28f793da01a15906b7fa7a4e17
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ayounsi: Looks good to me, approved
  Dzahn: Looks good to me, but someone else must approve



diff --git a/manifests/site.pp b/manifests/site.pp
index c91e21d..a25a3b9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -960,6 +960,11 @@
 role(dumps::web::htmldumps)
 }
 
+node 'ftp-internal.eqiad.wmnet' {
+# temp FTP server for T175342
+role(test)
+}
+
 # Virtualization hosts
 node /^ganeti[12]00[0-9]\.(codfw|eqiad)\.wmnet$/ {
 role(ganeti)

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add ftp-internal to puppet

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382623 )

Change subject: Add ftp-internal to puppet
..

Add ftp-internal to puppet

Change-Id: Id790f641c477ea28f793da01a15906b7fa7a4e17
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/382623/1

diff --git a/manifests/site.pp b/manifests/site.pp
index c91e21d..42fce35 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -960,6 +960,11 @@
 role(dumps::web::htmldumps)
 }
 
+node 'ftp-internal.eqiad.wmnet' {
+# temp FTP server for T175342
+role(spare::system)
+}
+
 # Virtualization hosts
 node /^ganeti[12]00[0-9]\.(codfw|eqiad)\.wmnet$/ {
 role(ganeti)

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add partman receipe for ftp-internal

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382620 )

Change subject: Add partman receipe for ftp-internal
..


Add partman receipe for ftp-internal

Change-Id: Ifd9704f0d6842547c9fa6add34a9c921fc91c63a
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 277d7a9..9414ebc 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -81,6 +81,7 @@
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
 eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
 francium|tegmen) echo partman/raid10-gpt.cfg ;; \
+ftp-internal) echo partman/flat.cfg virtual.cfg ;; \
 
gerrit2001|labtestnet2002|labtestneutron2002|netmon1002|netmon2001|phab1001) 
echo partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 ganeti100[1-4]) echo partman/ganeti-raid1.cfg ;; \
 ganeti100[5-8]) echo partman/ganeti.cfg ;; \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd9704f0d6842547c9fa6add34a9c921fc91c63a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add partman receipe for ftp-internal

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382620 )

Change subject: Add partman receipe for ftp-internal
..

Add partman receipe for ftp-internal

Change-Id: Ifd9704f0d6842547c9fa6add34a9c921fc91c63a
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/382620/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 277d7a9..9414ebc 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -81,6 +81,7 @@
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
 eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
 francium|tegmen) echo partman/raid10-gpt.cfg ;; \
+ftp-internal) echo partman/flat.cfg virtual.cfg ;; \
 
gerrit2001|labtestnet2002|labtestneutron2002|netmon1002|netmon2001|phab1001) 
echo partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 ganeti100[1-4]) echo partman/ganeti-raid1.cfg ;; \
 ganeti100[5-8]) echo partman/ganeti.cfg ;; \

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add DHCP entry for ftp-internal

[Ayounsi (Code Review)]

Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382619 )

Change subject: Add DHCP entry for ftp-internal
..


Add DHCP entry for ftp-internal

Change-Id: I53547b5deb2303121a07c9bfc3f8b3f9803b3d58
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index d01dba3..74ab995 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -146,6 +146,13 @@
 fixed-address fermium.wikimedia.org;
 }
 
+host ftp-internal {
+  hardware ethernet aa:00:00:3c:da:9f;
+  fixed-address ftp-internal.eqiad.wmnet;
+  option pxelinux.pathprefix "stretch-installer/";
+  filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host hassaleh {
 hardware ethernet aa:00:00:3f:8c:a0;
 fixed-address hassaleh.codfw.wmnet;
@@ -385,4 +392,3 @@
 hardware ethernet aa:00:00:45:62:2d;
 fixed-address tureis.codfw.wmnet;
 }
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53547b5deb2303121a07c9bfc3f8b3f9803b3d58
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add DHCP entry for ftp-internal

[Ayounsi (Code Review)]

Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382619 )

Change subject: Add DHCP entry for ftp-internal
..

Add DHCP entry for ftp-internal

Change-Id: I53547b5deb2303121a07c9bfc3f8b3f9803b3d58
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/382619/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index d01dba3..74ab995 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -146,6 +146,13 @@
 fixed-address fermium.wikimedia.org;
 }
 
+host ftp-internal {
+  hardware ethernet aa:00:00:3c:da:9f;
+  fixed-address ftp-internal.eqiad.wmnet;
+  option pxelinux.pathprefix "stretch-installer/";
+  filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host hassaleh {
 hardware ethernet aa:00:00:3f:8c:a0;
 fixed-address hassaleh.codfw.wmnet;
@@ -385,4 +392,3 @@
 hardware ethernet aa:00:00:45:62:2d;
 fixed-address tureis.codfw.wmnet;
 }
-

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits