[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add user bstorm to group ops

2018-01-23 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405923 )

Change subject: Add user bstorm to group ops
..

Add user bstorm to group ops

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


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 8f25c29..4e28605 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -28,7 +28,7 @@
 members: _members [filippo, jgreen, bblack, andrew, faidon, rush, 
oblivian, yuvipanda,
   dzahn, akosiaris, mark, ariel, cmjohnson, otto, robh, tstarling,
   ori, jmm, jynus, aaron, ema, elukey, gehel, volans, madhuvishy, 
marostegui,
-  ayounsi, herron, aborrero]
+  ayounsi, herron, aborrero, bstorm]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   ops-staff-group:
 # No gid for this group on purpose, it's a system provided one

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add bstorm to production shell users

2018-01-23 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405922 )

Change subject: Add bstorm to production shell users
..

Add bstorm to production shell users

Bug: T185591
Change-Id: I40f56628feaa7856316a3385cfa454ae02be1691
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 111fbb4..8f25c29 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2694,6 +2694,15 @@
 - 
B3NzaC1yc2EDAQABAAACAQCyCPFZyyNoNnyQH0dk/+XYmVpnxri8Z5nOg1vW6r82UAPjtquqAp79a6XEs28F5yRDob9z3wtqK1U9seVt6wf3t5+4k4B0cBR8oplLPBfI/CTAKdqugI0XwvjYxEp3KV77sF9SVOfFexhs1vOD5WRnJnQ3WpBkCo9bW7X/xq+oMchz8knCvHQ7NqAe+poJLHjMjJnaRSnZviQn5RSyset13c0kzevxDzvE7BugYR3p329ZrKpp17wPVOt4lnoXnokItZF9WqY4/nLaZIAieCuXLrA8rNIvsciNvKeMuWhaPd1v5UdFMG/jQ2jaHA74Sxxds7VgCrhJK9YHtyXV4JYmbiDGbh4nIsgpSd3w8dnRM/6TcxWMmnLkePS1uzYOfaTp/SONFoNqwPrF3hsm9Pg9O4f4vdSxoZ/3B7hO7yD/BlYrYVU7UDOgwuxjBTX2JhnZpCgmAX9P9sNMprHrcGDrLpeqGBH6E6Vx/z6QwBpatf/Q8WVJJU2Q5wqBvqEibl5rmDE8b+Eyw/k1gRoxNYp7bV81e5ht4e7hLbXkFVdn64JCavKur6mXCbGFPlklgCA/svpJLUl7dcdm+s67V615r8CzIyDwl7e8sGc+586X4zM1Uqvy84xL5l/ASLTObSkU5p3xgNWyEWYm+fTu0l0PdgoOxtEFg8nM89N/XdAFHw==
 mneis...@wikimedia.org
 uid: 18650
 email: mneis...@wikimedia.org
+  bstorm:
+ensure: present
+gid: 500
+name: bstorm
+realname: Brooke Storm
+ssh_keys:
+- ssh-rsa 
B3NzaC1yc2EDAQABAAACAQDCmlqfMXTHX55tpcUeYOxp+RAJ11y6CW9v48PV5Sg/HrYWw8M3sP1/aqqFQI9XOKIN2AMSNPE4zUqHORhXP1E5AwKW2hln38btoQdiJn4icKsUuBQo36JVsoRXDpwiUCnNt21TY0IB0AwYBG3iR364D845BxZkgPLyWGB9QyPJBVV9GtWc9sYfn2XYpY1qDGuimG3hPMIk+C9H3FU40Pss0+2D8NVsT483OdmntPRGZ+zZSRc2laIBawc6hF5p6bSZVh/u+sLjHLY+wCexdWX0+3NQspuWD8DGsBVA8zlgan8Zz96sHEqbg5hp9KYkI2OSKvJImphBkShHHVDPTm9yMgw/UPBSDrUW0y45BJtgyqKPII8jOFJIWzeDDkQFMks/sATPlruuhMMh2ATNGsDaeIib+M46RhmubBxXfPF9ktfXLY11/nYiDMxdiIQs5Ho/hp+bl//q2HlCKWugdZz9nFlAqL6VGVnOyU+F0NA+oGwmMtDYehFo4C7AqhGJmry8TNruJtsDPyCv01BNn3NytSZJjRWQ902LFRNSkznoJ+cc4S6hnHRELI1xVJtFbq6SM4ZEQzlIDuS3GLZLPUyjWYR3KfQ3jj8si5c/xqyg+9JLNJVX9LcqIrvCT/hzdFDV65NeQyC7XdW4HZYDz72H3Pa08DpPYrwnnXWblaO5Jw==
 bst...@wikimedia.org
+uid: 18713
+email: bst...@wikimedia.org
 
 ldap_only_users:
   abartov:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: shinken: Point irc notify log file to wikimedia-cloud-feed

2018-01-16 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404530 )

Change subject: shinken: Point irc notify log file to wikimedia-cloud-feed
..


shinken: Point irc notify log file to wikimedia-cloud-feed

The ircecho shinken bot is looking to read logs from
wikimedia-cloud-feed.log. Fixing the notifications to write
to the right file.

Change-Id: Ie6e9d305b492edf4fa751e9e4d962b533f6121e2
---
M modules/nagios_common/templates/notification_commands.cfg.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/nagios_common/templates/notification_commands.cfg.erb 
b/modules/nagios_common/templates/notification_commands.cfg.erb
index 84233cf..563212e 100644
--- a/modules/nagios_common/templates/notification_commands.cfg.erb
+++ b/modules/nagios_common/templates/notification_commands.cfg.erb
@@ -93,12 +93,12 @@
 # IRC output for (tool)labs
 define command{
command_namenotify-host-by-irc-labs
-   command_lineecho "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is 
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%= 
@irc_dir_path %>/irc-labs.log
+   command_lineecho "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is 
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%= 
@irc_dir_path %>/irc-cloud-feed.log
}
 
 define command{
command_namenotify-service-by-irc-labs
-   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" | sed -r -e 's/%27(https)/\1/g' -e 's/%27(\+|$$)/ /g' >> <%= 
@irc_dir_path %>/irc-labs.log
+   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" | sed -r -e 's/%27(https)/\1/g' -e 's/%27(\+|$$)/ /g' >> <%= 
@irc_dir_path %>/irc-cloud-feed.log
}
 
 # IRC output for Analytics

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6e9d305b492edf4fa751e9e4d962b533f6121e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: shinken: Point irc notify log file to wikimedia-cloud-feed

2018-01-16 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404530 )

Change subject: shinken: Point irc notify log file to wikimedia-cloud-feed
..

shinken: Point irc notify log file to wikimedia-cloud-feed

The ircecho shinken bot is looking to read logs from
wikimedia-cloud-feed.log. Fixing the notifications to write
to the right file.

Change-Id: Ie6e9d305b492edf4fa751e9e4d962b533f6121e2
---
M modules/nagios_common/templates/notification_commands.cfg.erb
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/nagios_common/templates/notification_commands.cfg.erb 
b/modules/nagios_common/templates/notification_commands.cfg.erb
index 84233cf..563212e 100644
--- a/modules/nagios_common/templates/notification_commands.cfg.erb
+++ b/modules/nagios_common/templates/notification_commands.cfg.erb
@@ -93,12 +93,12 @@
 # IRC output for (tool)labs
 define command{
command_namenotify-host-by-irc-labs
-   command_lineecho "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is 
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%= 
@irc_dir_path %>/irc-labs.log
+   command_lineecho "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is 
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%= 
@irc_dir_path %>/irc-cloud-feed.log
}
 
 define command{
command_namenotify-service-by-irc-labs
-   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" | sed -r -e 's/%27(https)/\1/g' -e 's/%27(\+|$$)/ /g' >> <%= 
@irc_dir_path %>/irc-labs.log
+   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" | sed -r -e 's/%27(https)/\1/g' -e 's/%27(\+|$$)/ /g' >> <%= 
@irc_dir_path %>/irc-cloud-feed.log
}
 
 # IRC output for Analytics

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps_distribution: Set up initial NFS exports

2018-01-11 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403837 )

Change subject: dumps_distribution: Set up initial NFS exports
..


dumps_distribution: Set up initial NFS exports

Bug: T181431
Change-Id: Ie8c0d8bda63f82b4b77db4ffcb20d48a4fd6467a
---
A modules/profile/files/dumps/distribution/nfs-exports
M modules/profile/manifests/dumps/distribution/nfs.pp
2 files changed, 20 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/files/dumps/distribution/nfs-exports 
b/modules/profile/files/dumps/distribution/nfs-exports
new file mode 100644
index 000..047d3d9
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-exports
@@ -0,0 +1,10 @@
+#  THIS FILE IS MANAGED BY PUPPET
+#
+# Export dumps to Cloud VPS instances
+#
+# /etc/exports: the access control list for filesystems which may be exported
+#  to NFS clients.  See exports(5).
+#
+
+/srv/dumps/xmldatadumps
10.68.0.0/16(ro,fsid=0,sec=sys,sync,subtree_check,root_squash,nocrossmnt)
+/srv/dumps/xmldatadumps/public 
10.68.0.0/16(ro,sec=sys,no_subtree_check,all_squash,nocrossmnt)
diff --git a/modules/profile/manifests/dumps/distribution/nfs.pp 
b/modules/profile/manifests/dumps/distribution/nfs.pp
index 0f3a8c3..9538534 100644
--- a/modules/profile/manifests/dumps/distribution/nfs.pp
+++ b/modules/profile/manifests/dumps/distribution/nfs.pp
@@ -29,9 +29,18 @@
 content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
 }
 
+file { '/etc/exports':
+mode=> '0444',
+owner   => 'root',
+group   => 'root',
+source  => 'puppet:///modules/profile/dumps/distribution/nfs-exports',
+require => Package['nfs-kernel-server'],
+}
+
 # Manage state manually
 service { 'nfs-kernel-server':
-enable => false,
+enable  => false,
+require => Package['nfs-kernel-server'],
 }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8c0d8bda63f82b4b77db4ffcb20d48a4fd6467a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: dumps_distribution: Set up initial NFS exports

2018-01-11 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403837 )

Change subject: dumps_distribution: Set up initial NFS exports
..

dumps_distribution: Set up initial NFS exports

Bug: T181431
Change-Id: Ie8c0d8bda63f82b4b77db4ffcb20d48a4fd6467a
---
A modules/profile/files/dumps/distribution/nfs-exports
M modules/profile/manifests/dumps/distribution/nfs.pp
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/403837/1

diff --git a/modules/profile/files/dumps/distribution/nfs-exports 
b/modules/profile/files/dumps/distribution/nfs-exports
new file mode 100644
index 000..df53182
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-exports
@@ -0,0 +1,3 @@
+# Export dumps to Cloud VPS instances
+/srv/dumps/xmldatadumps
10.68.0.0/16(ro,fsid=0,sec=sys,sync,subtree_check,root_squash,nocrossmnt)
+/srv/dumps/xmldatadumps/public 
10.68.0.0/16(ro,sec=sys,no_subtree_check,all_squash,nocrossmnt)
diff --git a/modules/profile/manifests/dumps/distribution/nfs.pp 
b/modules/profile/manifests/dumps/distribution/nfs.pp
index 0f3a8c3..a28c3de 100644
--- a/modules/profile/manifests/dumps/distribution/nfs.pp
+++ b/modules/profile/manifests/dumps/distribution/nfs.pp
@@ -29,9 +29,18 @@
 content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
 }
 
+file { '/etc/exports':
+mode=> '0444',
+owner   => 'root',
+group   => 'root',
+source => 'puppet:///modules/profile/dumps/distribution/nfs-exports',
+require => Package['nfs-kernel-server'],
+}
+
 # Manage state manually
 service { 'nfs-kernel-server':
 enable => false,
+require => Package['nfs-kernel-server'],
 }
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP: nfsclient: Setup dumps mounts from new servers

2018-01-11 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403767 )

Change subject: WIP: nfsclient: Setup dumps mounts from new servers
..

WIP: nfsclient: Setup dumps mounts from new servers

This patch is just a proof of concept that I'm
using to locally test these changes in the
testlabs project.

Bug: T171540
Change-Id: Ifa51ecfe05a360cf9a4560e49d6d386edceba1d2
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 33 insertions(+), 0 deletions(-)


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

diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index 28cfcc9..553a13d 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -139,4 +139,37 @@
 require => Labstore::Nfs_mount['scratch-on-labstore1003'],
 }
 }
+
+if $::labsproject == 'testlabs' {
+
+  labstore::nfs_mount { 'dumps-on-labstore1006':
+  mount_name  => 'dumps',
+  project => $::labsproject,
+  options => ['ro', 'soft', 'timeo=300', 'retrans=3'],
+  mount_path  => '/mnt/nfs/labstore1006-dumps',
+  share_path  => '/public',
+  server  => 'labstore1006.wikimedia.org',
+  lookupcache => $lookupcache,
+  }
+
+  labstore::nfs_mount { 'dumps-on-labstore1007':
+  mount_name  => 'dumps',
+  project => $::labsproject,
+  options => ['ro', 'soft', 'timeo=300', 'retrans=3'],
+  mount_path  => '/mnt/nfs/labstore1007-dumps',
+  share_path  => '/public',
+  server  => 'labstore1007.wikimedia.org',
+  lookupcache => $lookupcache,
+  }
+
+  if mount_nfs_volume($::labsproject, 'dumps') {
+  file { '/public/newdumps':
+  ensure  => 'link',
+  force   => true,
+  target  => '/mnt/nfs/labstore1006-dumps',
+  require => Labstore::Nfs_mount['dumps-on-labstore1006'],
+  }
+  }
+}
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs: Add s8.labsdb and move wikidatawiki

2018-01-09 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403315 )

Change subject: wmcs: Add s8.labsdb and move wikidatawiki
..


wmcs: Add s8.labsdb and move wikidatawiki

Bug: T184179
Change-Id: I1c0d9468e59682b1ceb061a58bc1defa6a9b7151
---
M modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone 
b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
index f19bcdf..35f98d3 100644
--- a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
+++ b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
@@ -910,7 +910,6 @@
 
 s5 1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
 dewiki 1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
-wikidatawiki   1H  IN  CNAME   s5.analytics.db.svc.eqiad.wmflabs.
 
 s6 1H  IN  CNAME   s6.analytics.db.svc.eqiad.wmflabs.
 frwiki 1H  IN  CNAME   s6.analytics.db.svc.eqiad.wmflabs.
@@ -932,3 +931,6 @@
 viwiki 1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
 centralauth1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
 meta   1H  IN  CNAME   s7.analytics.db.svc.eqiad.wmflabs.
+
+s8 1H  IN  CNAME   s8.analytics.db.svc.eqiad.wmflabs.
+wikidatawiki   1H  IN  CNAME   s8.analytics.db.svc.eqiad.wmflabs.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c0d9468e59682b1ceb061a58bc1defa6a9b7151
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Arturo Borrero Gonzalez 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: wikireplica: Remove dns for deleted wikis als.wiki* and mo....

2018-01-05 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402458 )

Change subject: wikireplica: Remove dns for deleted wikis als.wiki* and  mo.wik*
..


wikireplica: Remove dns for deleted wikis als.wiki* and  mo.wik*

Remove dns entries for Remove als.wik(ibooks|iquote|tionary),
mo.wik(ipedia|tionary) views from replicas. alswiki still exists.

Bug: T181925
Change-Id: I595c9031d9774e3434318e7f1e5bad5bb45f1f5f
---
M modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone 
b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
index ce5ac89..f19bcdf 100644
--- a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
+++ b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
@@ -46,9 +46,6 @@
 akwikibooks1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 akwiktionary   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 alswiki1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
-alswikibooks   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
-alswikiquote   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
-alswiktionary  1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 amwiki 1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 amwikimedia1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 amwikiquote1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
@@ -524,8 +521,6 @@
 mnwikibooks1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 mnwiktionary   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 movementroleswiki  1H  IN  CNAME   
s3.analytics.db.svc.eqiad.wmflabs.
-mowiki 1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
-mowiktionary   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 mrjwiki1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 mrwiki 1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 mrwikibooks1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I595c9031d9774e3434318e7f1e5bad5bb45f1f5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: wikireplica: Remove dns for deleted wikis als.wiki* and mo....

2018-01-05 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402458 )

Change subject: wikireplica: Remove dns for deleted wikis als.wiki* and  mo.wik*
..

wikireplica: Remove dns for deleted wikis als.wiki* and  mo.wik*

Remove dns entries for Remove als.wik(ibooks|iquote|tionary),
mo.wik(ipedia|tionary) views from replicas. alswiki still exists.

Bug: T181925
Change-Id: I595c9031d9774e3434318e7f1e5bad5bb45f1f5f
---
M modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/402458/1

diff --git a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone 
b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
index ce5ac89..f19bcdf 100644
--- a/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
+++ b/modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
@@ -46,9 +46,6 @@
 akwikibooks1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 akwiktionary   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 alswiki1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
-alswikibooks   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
-alswikiquote   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
-alswiktionary  1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 amwiki 1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 amwikimedia1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 amwikiquote1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
@@ -524,8 +521,6 @@
 mnwikibooks1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 mnwiktionary   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 movementroleswiki  1H  IN  CNAME   
s3.analytics.db.svc.eqiad.wmflabs.
-mowiki 1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
-mowiktionary   1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 mrjwiki1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 mrwiki 1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.
 mrwikibooks1H  IN  CNAME   s3.analytics.db.svc.eqiad.wmflabs.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmcs: Add database drop support to maintain-views

2018-01-05 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402137 )

Change subject: wmcs: Add database drop support to maintain-views
..


wmcs: Add database drop support to maintain-views

Add a new `--drop` argument to maintain-views that can be used to remove
the _p database for a Wiki Replica. This option requires that
`--database` also be given to explicitly name the databases to be
dropped.

Bug: T181925
Change-Id: I91f3b49cade4ccbd822d95a906dbe738ac0d370c
---
M modules/role/files/labs/db/views/maintain-views.py
1 file changed, 37 insertions(+), 9 deletions(-)

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



diff --git a/modules/role/files/labs/db/views/maintain-views.py 
b/modules/role/files/labs/db/views/maintain-views.py
index 23a7dc9..23abc15 100644
--- a/modules/role/files/labs/db/views/maintain-views.py
+++ b/modules/role/files/labs/db/views/maintain-views.py
@@ -113,9 +113,10 @@
 if self.table_exists(view, self.db):
 # If it does, create or replace the view for it.
 logging.info("[{}] ".format(view))
-if (self.replace_all or not self.table_exists(view, self.db_p) or
-input('View already exists. Replace? [y/N] ').lower()
-in ['y', 'yes']):
+if (
+not self.table_exists(view, self.db_p) or
+self._confirm('View already exists. Replace?')
+):
 # Can't use pymysql to build this
 self.write_execute("""
 CREATE OR REPLACE
@@ -194,10 +195,10 @@
 
 if len(sources) == len(sources_checked):
 
-if (self.replace_all or
-not self.table_exists(view_name, self.db_p) or
-input('View already exists. Replace? [y/N] ').lower()
-in ['y', 'yes']):
+if (
+not self.table_exists(view_name, self.db_p) or
+self._confirm('View already exists. Replace?')
+):
 logging.info("[{}] ".format(view_name))
 self.create_customview(
 view_name,
@@ -275,6 +276,21 @@
 for view_name, view_details in customviews.items():
 self.do_customview(view_name, view_details)
 
+def drop_public_database(self):
+"""Drop a public database entirely."""
+if self.database_exists(self.db_p):
+if self._confirm('Drop {}?'.format(self.db_p)):
+self.write_execute("DROP DATABASE `{}`;".format(self.db_p))
+else:
+logging.warning('DB {} does not exist'.format(self.db_p))
+
+def _confirm(self, msg):
+"""Prompt for confirmation unless self.replace_all is true."""
+return (
+self.replace_all or
+input("{} [y/N] ".format(msg)).lower() in ['y', 'yes']
+)
+
 
 if __name__ == "__main__":
 
@@ -313,8 +329,12 @@
 )
 argparser.add_argument(
 "--clean",
-help=("Clean out views from _p varient that are no longer specified"
-  " make changes."),
+help="Clean out views from _p db that are no longer specified.",
+action="store_true"
+)
+argparser.add_argument(
+"--drop",
+help="Remove _p db entirely.",
 action="store_true"
 )
 argparser.add_argument(
@@ -347,6 +367,10 @@
 # argparse mutually exclusive is weird http://bugs.python.org/issue10984
 if args.table and args.clean:
 logging.critical("cannot specify a single table and cleanup")
+sys.exit(1)
+
+if args.drop and not args.databases:
+logging.critical("--drop must specify database names")
 sys.exit(1)
 
 with open(args.config_location, 'r') as stream:
@@ -449,6 +473,10 @@
 logging.critical("Definer has not been created")
 sys.exit(1)
 
+if args.drop:
+ops.drop_public_database()
+continue
+
 ops.execute(fullviews, customviews)
 
 if args.clean:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91f3b49cade4ccbd822d95a906dbe738ac0d370c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Volans 
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]: wmcs: maintain-meta_p missing python-requests

2018-01-04 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402117 )

Change subject: wmcs: maintain-meta_p missing python-requests
..


wmcs: maintain-meta_p missing python-requests

```
$ sudo /usr/local/sbin/maintain-meta_p --all-databases --purge
Traceback (most recent call last):
  File "/usr/local/sbin/maintain-meta_p", line 25, in 
import requests
ImportError: No module named requests
```

This package must have been installed as a side effect of something else
previously. Seems likely to have broken as a result of reimaging as
stretch.

Change-Id: I8e00605d0e41cc436fed5c2936ae16e11170d143
---
M modules/role/manifests/labs/db/views.pp
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/labs/db/views.pp 
b/modules/role/manifests/labs/db/views.pp
index 545209f..4c96fa6 100644
--- a/modules/role/manifests/labs/db/views.pp
+++ b/modules/role/manifests/labs/db/views.pp
@@ -1,7 +1,11 @@
 # deploy scripts and its dependencies to create replica views
 class role::labs::db::views {
 
-package { ['python-simplejson', 'python-pymysql']:
+package { [
+'python-pymysql',
+'python-requests',
+'python-simplejson',
+]:
 ensure => present,
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e00605d0e41cc436fed5c2936ae16e11170d143
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: dumps: Set up NFS on the dumps distribution servers

2018-01-01 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401420 )

Change subject: dumps: Set up NFS on the dumps distribution servers
..


dumps: Set up NFS on the dumps distribution servers

Bug: T181431
Change-Id: I5ae96b29a284983edb257330db13ed5eb2639b68
---
A modules/profile/files/dumps/distribution/nfs-common
A modules/profile/files/dumps/distribution/nfs-kernel-server
A modules/profile/manifests/dumps/distribution/nfs.pp
M modules/profile/manifests/dumps/distribution/server.pp
M modules/role/manifests/dumps/distribution/server.pp
5 files changed, 79 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/files/dumps/distribution/nfs-common 
b/modules/profile/files/dumps/distribution/nfs-common
new file mode 100644
index 000..cd91678
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-common
@@ -0,0 +1,17 @@
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=yes
+
+# Options for rpc.statd.
+#   Should rpc.statd listen on a specific port? This is especially useful
+#   when you have a port-based firewall. To use a fixed port, set this
+#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
+#   For more information, see rpc.statd(8) or 
http://wiki.debian.org/SecuringNFS
+STATDOPTS='--port 55659 --outgoing-port 44153'
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=
+NEED_LOCKD=no
diff --git a/modules/profile/files/dumps/distribution/nfs-kernel-server 
b/modules/profile/files/dumps/distribution/nfs-kernel-server
new file mode 100644
index 000..bfb4950
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-kernel-server
@@ -0,0 +1,23 @@
+# Number of servers to start up
+# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
+
+# Best as max concurrently connected clients.  We currently hover around
+# 250-280 connected clients as of 1/25/2016
+RPCNFSDCOUNT=192
+
+# Runtime priority of server (see nice(1))
+RPCNFSDPRIORITY=0
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option. For more information,
+# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
+# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
+RPCMOUNTDOPTS='--manage-gids --port 38466 --no-nfs-version 2,3'
+
+# Do you want to start the svcgssd daemon? It is only required for Kerberos
+# exports. Valid alternatives are "yes" and "no"; the default is "no".
+NEED_SVCGSSD=
+
+# Options for rpc.svcgssd.
+RPCSVCGSSDOPTS=
diff --git a/modules/profile/manifests/dumps/distribution/nfs.pp 
b/modules/profile/manifests/dumps/distribution/nfs.pp
new file mode 100644
index 000..0f3a8c3
--- /dev/null
+++ b/modules/profile/manifests/dumps/distribution/nfs.pp
@@ -0,0 +1,37 @@
+# Set up NFS Server for the public dumps servers
+# Firewall rules are managed separately through profile::wmcs::nfs::ferm
+
+class profile::dumps::distribution::nfs {
+
+require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
+
+file { '/etc/default/nfs-common':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/profile/dumps/distribution/nfs-common',
+}
+
+file { '/etc/default/nfs-kernel-server':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/profile/dumps/distribution/nfs-kernel-server',
+}
+
+file { '/etc/modprobe.d/nfs-lockd.conf':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
+}
+
+# Manage state manually
+service { 'nfs-kernel-server':
+enable => false,
+}
+
+}
diff --git a/modules/profile/manifests/dumps/distribution/server.pp 
b/modules/profile/manifests/dumps/distribution/server.pp
index a7d1edc..35a6c15 100644
--- a/modules/profile/manifests/dumps/distribution/server.pp
+++ b/modules/profile/manifests/dumps/distribution/server.pp
@@ -3,6 +3,7 @@
 # or via web or rsync to mirrors
 
 class profile::dumps::distribution::server {
+
 class { '::dumpsuser': }
 
 file { '/srv/dumps':
diff --git a/modules/role/manifests/dumps/distribution/server.pp 
b/modules/role/manifests/dumps/distribution/server.pp
index 250130c..c40f2d0 100644
--- a/modules/role/manifests/dumps/distribution/server.pp
+++ b/modules/role/manifests/dumps/distribution/server.pp
@@ -5,10 +5,10 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: Set up NFS on the dumps distribution servers

2018-01-01 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401420 )

Change subject: dumps: Set up NFS on the dumps distribution servers
..

dumps: Set up NFS on the dumps distribution servers

Bug: T181431
Change-Id: I5ae96b29a284983edb257330db13ed5eb2639b68
---
A modules/profile/files/dumps/distribution/nfs-common
A modules/profile/files/dumps/distribution/nfs-kernel-server
A modules/profile/manifests/dumps/distribution/nfs.pp
M modules/profile/manifests/dumps/distribution/server.pp
M modules/role/manifests/dumps/distribution/server.pp
5 files changed, 79 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/401420/1

diff --git a/modules/profile/files/dumps/distribution/nfs-common 
b/modules/profile/files/dumps/distribution/nfs-common
new file mode 100644
index 000..cd91678
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-common
@@ -0,0 +1,17 @@
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=yes
+
+# Options for rpc.statd.
+#   Should rpc.statd listen on a specific port? This is especially useful
+#   when you have a port-based firewall. To use a fixed port, set this
+#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
+#   For more information, see rpc.statd(8) or 
http://wiki.debian.org/SecuringNFS
+STATDOPTS='--port 55659 --outgoing-port 44153'
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=
+NEED_LOCKD=no
diff --git a/modules/profile/files/dumps/distribution/nfs-kernel-server 
b/modules/profile/files/dumps/distribution/nfs-kernel-server
new file mode 100644
index 000..bfb4950
--- /dev/null
+++ b/modules/profile/files/dumps/distribution/nfs-kernel-server
@@ -0,0 +1,23 @@
+# Number of servers to start up
+# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
+
+# Best as max concurrently connected clients.  We currently hover around
+# 250-280 connected clients as of 1/25/2016
+RPCNFSDCOUNT=192
+
+# Runtime priority of server (see nice(1))
+RPCNFSDPRIORITY=0
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option. For more information,
+# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
+# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
+RPCMOUNTDOPTS='--manage-gids --port 38466 --no-nfs-version 2,3'
+
+# Do you want to start the svcgssd daemon? It is only required for Kerberos
+# exports. Valid alternatives are "yes" and "no"; the default is "no".
+NEED_SVCGSSD=
+
+# Options for rpc.svcgssd.
+RPCSVCGSSDOPTS=
diff --git a/modules/profile/manifests/dumps/distribution/nfs.pp 
b/modules/profile/manifests/dumps/distribution/nfs.pp
new file mode 100644
index 000..0f3a8c3
--- /dev/null
+++ b/modules/profile/manifests/dumps/distribution/nfs.pp
@@ -0,0 +1,37 @@
+# Set up NFS Server for the public dumps servers
+# Firewall rules are managed separately through profile::wmcs::nfs::ferm
+
+class profile::dumps::distribution::nfs {
+
+require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
+
+file { '/etc/default/nfs-common':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/profile/dumps/distribution/nfs-common',
+}
+
+file { '/etc/default/nfs-kernel-server':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/profile/dumps/distribution/nfs-kernel-server',
+}
+
+file { '/etc/modprobe.d/nfs-lockd.conf':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
+}
+
+# Manage state manually
+service { 'nfs-kernel-server':
+enable => false,
+}
+
+}
diff --git a/modules/profile/manifests/dumps/distribution/server.pp 
b/modules/profile/manifests/dumps/distribution/server.pp
index a7d1edc..35a6c15 100644
--- a/modules/profile/manifests/dumps/distribution/server.pp
+++ b/modules/profile/manifests/dumps/distribution/server.pp
@@ -3,6 +3,7 @@
 # or via web or rsync to mirrors
 
 class profile::dumps::distribution::server {
+
 class { '::dumpsuser': }
 
 file { '/srv/dumps':
diff --git a/modules/role/manifests/dumps/distribution/server.pp 
b/modules/role/manifests/dumps/distribution/server.pp
index 250130c..c40f2d0 100644
--- a/modules/role/manifests/dumps/distribution/server.pp
+++ b/modules/role/manifests/dumps/distribution/server.pp
@@ -5,10 +5,10 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps_public: Cleanup the public_server profile

2018-01-01 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401419 )

Change subject: dumps_public: Cleanup the public_server profile
..


dumps_public: Cleanup the public_server profile

Remove profile left over from previous clean up

Change-Id: I9710121210b86ae11844c1ecc6edebb10b997c47
---
D modules/profile/manifests/dumps/public_server.pp
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
deleted file mode 100644
index 69c6b12..000
--- a/modules/profile/manifests/dumps/public_server.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Profile for Dumps server in the Public VLAN,
-# that serves dumps to Cloud VPS/Stat boxes via NFS,
-# or via web or rsync to mirrors
-
-class profile::dumps::public_server {
-class { '::dumpsuser': }
-class {'::public_dumps::server':}
-
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9710121210b86ae11844c1ecc6edebb10b997c47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: dumps_public: Cleanup the public_server profile

2018-01-01 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401419 )

Change subject: dumps_public: Cleanup the public_server profile
..

dumps_public: Cleanup the public_server profile

Remove profile left over from previous clean up

Change-Id: I9710121210b86ae11844c1ecc6edebb10b997c47
---
D modules/profile/manifests/dumps/public_server.pp
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/401419/1

diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
deleted file mode 100644
index 69c6b12..000
--- a/modules/profile/manifests/dumps/public_server.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Profile for Dumps server in the Public VLAN,
-# that serves dumps to Cloud VPS/Stat boxes via NFS,
-# or via web or rsync to mirrors
-
-class profile::dumps::public_server {
-class { '::dumpsuser': }
-class {'::public_dumps::server':}
-
-}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: public_dumps: Remove module path and rename to distribution

2017-12-31 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401198 )

Change subject: public_dumps: Remove module path and rename to distribution
..


public_dumps: Remove module path and rename to distribution

Removing the module path for public_dumps since it should
really be in the profile path.

Also changing public to distribution, since public is a vague
name, and we could end up with dumps generation and dumps
distribution as 2 distinct roles.

Bug: T171539
Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f
---
M manifests/site.pp
R modules/profile/manifests/dumps/distribution/server.pp
A modules/role/manifests/dumps/distribution/server.pp
D modules/role/manifests/dumps/public/server.pp
4 files changed, 21 insertions(+), 17 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index df1b8a0..d90fb8a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1248,7 +1248,7 @@
 }
 
 node /labstore100[67]\.wikimedia\.org/ {
-role(dumps::public::server)
+role(dumps::distribution::server)
 }
 
 node /labstore200[1-2]\.codfw\.wmnet/ {
diff --git a/modules/public_dumps/manifests/server.pp 
b/modules/profile/manifests/dumps/distribution/server.pp
similarity index 66%
rename from modules/public_dumps/manifests/server.pp
rename to modules/profile/manifests/dumps/distribution/server.pp
index 94e1429..a7d1edc 100644
--- a/modules/public_dumps/manifests/server.pp
+++ b/modules/profile/manifests/dumps/distribution/server.pp
@@ -1,5 +1,9 @@
-# Base class to set up a Public Dumps server
-class public_dumps::server {
+# Profile for Dumps distribution server in the Public VLAN,
+# that serves dumps to Cloud VPS/Stat boxes via NFS,
+# or via web or rsync to mirrors
+
+class profile::dumps::distribution::server {
+class { '::dumpsuser': }
 
 file { '/srv/dumps':
 ensure => 'directory',
diff --git a/modules/role/manifests/dumps/distribution/server.pp 
b/modules/role/manifests/dumps/distribution/server.pp
new file mode 100644
index 000..250130c
--- /dev/null
+++ b/modules/role/manifests/dumps/distribution/server.pp
@@ -0,0 +1,14 @@
+class role::dumps::distribution::server {
+system::role { 'dumps::distribution::server': description => 'labstore 
host in the public VLAN that distributes Dumps to clients via NFS/Web/Rsync' }
+
+include ::standard
+include ::profile::base::firewall
+include ::profile::wmcs::nfs::ferm
+include ::profile::dumps::distribution::server
+include ::profile::dumps::web::rsync_server
+include ::profile::dumps::rsyncer
+include ::profile::dumps::web::dumpstatusfiles_sync
+include ::profile::dumps::web::cleanup
+include ::profile::dumps::web::cleanup_miscdatasets
+
+}
diff --git a/modules/role/manifests/dumps/public/server.pp 
b/modules/role/manifests/dumps/public/server.pp
deleted file mode 100644
index d20ae51..000
--- a/modules/role/manifests/dumps/public/server.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class role::dumps::public::server {
-system::role { 'dumps::public::server': description => 'labstore host in 
the public VLAN that serves Dumps to clients via NFS/Web/Rsync' }
-
-include ::standard
-include ::profile::base::firewall
-include ::profile::wmcs::nfs::ferm
-include ::profile::dumps::public_server
-include ::profile::dumps::web::rsync_server
-include ::profile::dumps::rsyncer
-include ::profile::dumps::web::dumpstatusfiles_sync
-include ::profile::dumps::web::cleanup
-include ::profile::dumps::web::cleanup_miscdatasets
-
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
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]: public_dumps: Remove module path and rename to distribution

2017-12-31 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401198 )

Change subject: public_dumps: Remove module path and rename to distribution
..

public_dumps: Remove module path and rename to distribution

Removing the module path for public_dumps since it should
really be in the profile path.

Also changing public to distribution, since public is a vague
name, and we could end up with dumps generation and dumps
distribution as 2 distinct roles.

Bug: T171539
Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f
---
M manifests/site.pp
R modules/profile/manifests/dumps/distribution/server.pp
A modules/role/manifests/dumps/distribution/server.pp
D modules/role/manifests/dumps/public/server.pp
4 files changed, 21 insertions(+), 17 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index df1b8a0..d90fb8a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1248,7 +1248,7 @@
 }
 
 node /labstore100[67]\.wikimedia\.org/ {
-role(dumps::public::server)
+role(dumps::distribution::server)
 }
 
 node /labstore200[1-2]\.codfw\.wmnet/ {
diff --git a/modules/public_dumps/manifests/server.pp 
b/modules/profile/manifests/dumps/distribution/server.pp
similarity index 66%
rename from modules/public_dumps/manifests/server.pp
rename to modules/profile/manifests/dumps/distribution/server.pp
index 94e1429..a7d1edc 100644
--- a/modules/public_dumps/manifests/server.pp
+++ b/modules/profile/manifests/dumps/distribution/server.pp
@@ -1,5 +1,9 @@
-# Base class to set up a Public Dumps server
-class public_dumps::server {
+# Profile for Dumps distribution server in the Public VLAN,
+# that serves dumps to Cloud VPS/Stat boxes via NFS,
+# or via web or rsync to mirrors
+
+class profile::dumps::distribution::server {
+class { '::dumpsuser': }
 
 file { '/srv/dumps':
 ensure => 'directory',
diff --git a/modules/role/manifests/dumps/distribution/server.pp 
b/modules/role/manifests/dumps/distribution/server.pp
new file mode 100644
index 000..250130c
--- /dev/null
+++ b/modules/role/manifests/dumps/distribution/server.pp
@@ -0,0 +1,14 @@
+class role::dumps::distribution::server {
+system::role { 'dumps::distribution::server': description => 'labstore 
host in the public VLAN that distributes Dumps to clients via NFS/Web/Rsync' }
+
+include ::standard
+include ::profile::base::firewall
+include ::profile::wmcs::nfs::ferm
+include ::profile::dumps::distribution::server
+include ::profile::dumps::web::rsync_server
+include ::profile::dumps::rsyncer
+include ::profile::dumps::web::dumpstatusfiles_sync
+include ::profile::dumps::web::cleanup
+include ::profile::dumps::web::cleanup_miscdatasets
+
+}
diff --git a/modules/role/manifests/dumps/public/server.pp 
b/modules/role/manifests/dumps/public/server.pp
deleted file mode 100644
index d20ae51..000
--- a/modules/role/manifests/dumps/public/server.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class role::dumps::public::server {
-system::role { 'dumps::public::server': description => 'labstore host in 
the public VLAN that serves Dumps to clients via NFS/Web/Rsync' }
-
-include ::standard
-include ::profile::base::firewall
-include ::profile::wmcs::nfs::ferm
-include ::profile::dumps::public_server
-include ::profile::dumps::web::rsync_server
-include ::profile::dumps::rsyncer
-include ::profile::dumps::web::dumpstatusfiles_sync
-include ::profile::dumps::web::cleanup
-include ::profile::dumps::web::cleanup_miscdatasets
-
-}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "dumps: Turn off dumps auto-sync to labstore1006 for ...

2017-12-31 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401190 )

Change subject: Revert "dumps: Turn off dumps auto-sync to labstore1006 for 
reimaging"
..


Revert "dumps: Turn off dumps auto-sync to labstore1006 for reimaging"

This reverts commit 1c9a4581f7cac5014ab41200eb11f4697f2ce68b.

Change-Id: I418472b7aa162c5806428b3faca31651659b3e8d
---
M modules/profile/manifests/dumps/generation/server/primary.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp 
b/modules/profile/manifests/dumps/generation/server/primary.pp
index bb88970..5d65c20 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -3,8 +3,8 @@
 
 class { '::dumps::generation::server::rsyncer':
 xmldumpsdir=> 
$profile::dumps::generation::server::common::xmldumpsdir,
-xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/',
+xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/,labstore1006.wikimedia.org::data/xmldatadumps/public/',
 miscdumpsdir   => 
$profile::dumps::generation::server::common::miscdatasetsdir,
-miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/',
+miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/,labstore1006.wikimedia.org::data/xmldatadumps/public/other/',
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I418472b7aa162c5806428b3faca31651659b3e8d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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 "dumps: Turn off dumps auto-sync to labstore1006 for ...

2017-12-31 Thread Madhuvishy (Code Review) 
Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "dumps: Turn off dumps auto-sync to labstore1006 for 
reimaging"
..

Revert "dumps: Turn off dumps auto-sync to labstore1006 for reimaging"

This reverts commit 1c9a4581f7cac5014ab41200eb11f4697f2ce68b.

Change-Id: I418472b7aa162c5806428b3faca31651659b3e8d
---
M modules/profile/manifests/dumps/generation/server/primary.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/401190/1

diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp 
b/modules/profile/manifests/dumps/generation/server/primary.pp
index b932336..5ac8ce5 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -11,8 +11,8 @@
 
 class { '::dumps::generation::server::rsyncer':
 xmldumpsdir=> '/data/xmldatadumps',
-xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/',
+xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/,labstore1006.wikimedia.org::data/xmldatadumps/public/',
 miscdumpsdir   => '/data/otherdumps',
-miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/',
+miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/,labstore1006.wikimedia.org::data/xmldatadumps/public/other/',
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I418472b7aa162c5806428b3faca31651659b3e8d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
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]: maintain-dbusers: Stop managing account creation for labsdb1...

2017-12-15 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398533 )

Change subject: maintain-dbusers: Stop managing account creation for labsdb1001 
and 1003
..


maintain-dbusers: Stop managing account creation for labsdb1001 and 1003

Bug: T183029
Change-Id: Id644af5a02cdf3fddaafce5dab62f288b1118da0
---
M modules/role/manifests/labs/db/maintain_dbusers.pp
1 file changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/modules/role/manifests/labs/db/maintain_dbusers.pp 
b/modules/role/manifests/labs/db/maintain_dbusers.pp
index c23fc695..8e50408 100644
--- a/modules/role/manifests/labs/db/maintain_dbusers.pp
+++ b/modules/role/manifests/labs/db/maintain_dbusers.pp
@@ -42,12 +42,6 @@
 },
 'labsdbs' => {
 'hosts' => {
-'labsdb1001.eqiad.wmnet' => {
-'grant-type' => 'legacy',
-},
-'labsdb1003.eqiad.wmnet' => {
-'grant-type' => 'legacy',
-},
 'labsdb1005.eqiad.wmnet' => {
 'grant-type' => 'legacy',
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id644af5a02cdf3fddaafce5dab62f288b1118da0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: maintain-dbusers: Stop managing account creation for labsdb1...

2017-12-15 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398533 )

Change subject: maintain-dbusers: Stop managing account creation for labsdb1001 
and 1003
..

maintain-dbusers: Stop managing account creation for labsdb1001 and 1003

Bug: T183029
Change-Id: Id644af5a02cdf3fddaafce5dab62f288b1118da0
---
M modules/role/manifests/labs/db/maintain_dbusers.pp
1 file changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/modules/role/manifests/labs/db/maintain_dbusers.pp 
b/modules/role/manifests/labs/db/maintain_dbusers.pp
index c23fc695..8e50408 100644
--- a/modules/role/manifests/labs/db/maintain_dbusers.pp
+++ b/modules/role/manifests/labs/db/maintain_dbusers.pp
@@ -42,12 +42,6 @@
 },
 'labsdbs' => {
 'hosts' => {
-'labsdb1001.eqiad.wmnet' => {
-'grant-type' => 'legacy',
-},
-'labsdb1003.eqiad.wmnet' => {
-'grant-type' => 'legacy',
-},
 'labsdb1005.eqiad.wmnet' => {
 'grant-type' => 'legacy',
 },

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb: Point DNS at equivalent web.db.svc.eqiad.wmflabs hosts

2017-12-13 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397256 )

Change subject: labsdb: Point DNS at equivalent web.db.svc.eqiad.wmflabs hosts
..


labsdb: Point DNS at equivalent web.db.svc.eqiad.wmflabs hosts

Replace templated labsdb zone file with a static file that maps all
current wiki names from the wikimedia-config s*.dblist files as CNAMEs
of the appropriate s*.web.db.svc.eqiad.wmflabs service name.

Bug: T142807
Change-Id: Ib0351f0b8f12ef0476c8baf69153433722b8a182
---
D hieradata/common/profile/openstack/base/pdns/labsdb.yaml
A modules/profile/files/openstack/base/pdns/recursor/labsdb.zone
M modules/profile/manifests/openstack/base/pdns/recursor/service.pp
D modules/role/templates/labs/dns/db_aliases.erb
4 files changed, 938 insertions(+), 913 deletions(-)

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



diff --git a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml 
b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
deleted file mode 100644
index fd17098..000
--- a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
+++ /dev/null
@@ -1,899 +0,0 @@
-# There are two old school replica servers (c1, c3 -- c2 is dead now).  The 
mapping of
-# "shards" (s1, etc.) and databases (enwiki, etc.) to these is
-# arbitrary in so much as all replicas have all the same data
-#  and can be adjusted to depool a server or redistribute load.
-
-profile::openstack::base::pdns::labsdb::c1:
-  - c1
-
-profile::openstack::base::pdns::labsdb::c2:
-  - c2
-
-profile::openstack::base::pdns::labsdb::c3:
-  - bgwiki
-  - bgwiktionary
-  - commonswiki
-  - cswiki
-  - enwiki
-  - enwikiquote
-  - enwiktionary
-  - eowiki
-  - fiwiki
-  - idwiki
-  - itwiki
-  - nlwiki
-  - nowiki
-  - plwiki
-  - ptwiki
-  - s1
-  - s2
-  - s4
-  - svwiki
-  - thwiki
-  - trwiki
-  - zhwiki
-  - aawiki
-  - aawikibooks
-  - aawiktionary
-  - abwiki
-  - abwiktionary
-  - acewiki
-  - advisorywiki
-  - adywiki
-  - afwiki
-  - afwikibooks
-  - afwikiquote
-  - afwiktionary
-  - akwiki
-  - akwikibooks
-  - akwiktionary
-  - alswiki
-  - alswikibooks
-  - alswikiquote
-  - alswiktionary
-  - amwiki
-  - amwikimedia
-  - amwikiquote
-  - amwiktionary
-  - angwiki
-  - angwikibooks
-  - angwikiquote
-  - angwikisource
-  - angwiktionary
-  - anwiki
-  - anwiktionary
-  - arcwiki
-  - arwiki
-  - arwikibooks
-  - arwikimedia
-  - arwikinews
-  - arwikiquote
-  - arwikisource
-  - arwikiversity
-  - arwiktionary
-  - arzwiki
-  - astwiki
-  - astwikibooks
-  - astwikiquote
-  - astwiktionary
-  - aswiki
-  - aswikibooks
-  - aswikisource
-  - aswiktionary
-  - atjwiki
-  - avwiki
-  - avwiktionary
-  - aywiki
-  - aywikibooks
-  - aywiktionary
-  - azbwiki
-  - azwiki
-  - azwikibooks
-  - azwikiquote
-  - azwikisource
-  - azwiktionary
-  - barwiki
-  - bat_smgwiki
-  - bawiki
-  - bawikibooks
-  - bclwiki
-  - bdwikimedia
-  - be_x_oldwiki
-  - betawikiversity
-  - bewiki
-  - bewikibooks
-  - bewikimedia
-  - bewikiquote
-  - bewikisource
-  - bewiktionary
-  - bgwikibooks
-  - bgwikinews
-  - bgwikiquote
-  - bgwikisource
-  - bhwiki
-  - bhwiktionary
-  - biwiki
-  - biwikibooks
-  - biwiktionary
-  - bjnwiki
-  - bmwiki
-  - bmwikibooks
-  - bmwikiquote
-  - bmwiktionary
-  - bnwiki
-  - bnwikibooks
-  - bnwikisource
-  - bnwiktionary
-  - bowiki
-  - bowikibooks
-  - bowiktionary
-  - bpywiki
-  - brwiki
-  - brwikimedia
-  - brwikiquote
-  - brwikisource
-  - brwiktionary
-  - bswiki
-  - bswikibooks
-  - bswikinews
-  - bswikiquote
-  - bswikisource
-  - bswiktionary
-  - bugwiki
-  - bxrwiki
-  - c3
-  - cawiki
-  - cawikibooks
-  - cawikimedia
-  - cawikinews
-  - cawikiquote
-  - cawikisource
-  - cawiktionary
-  - cbk_zamwiki
-  - cdowiki
-  - cebwiki
-  - centralauth
-  - cewiki
-  - chowiki
-  - chrwiki
-  - chrwiktionary
-  - chwiki
-  - chwikibooks
-  - chwiktionary
-  - chywiki
-  - ckbwiki
-  - cnwikimedia
-  - cowiki
-  - cowikibooks
-  - cowikimedia
-  - cowikiquote
-  - cowiktionary
-  - crhwiki
-  - crwiki
-  - crwikiquote
-  - crwiktionary
-  - csbwiki
-  - csbwiktionary
-  - cswikibooks
-  - cswikinews
-  - cswikiquote
-  - cswikisource
-  - cswikiversity
-  - cswiktionary
-  - cuwiki
-  - cvwiki
-  - cvwikibooks
-  - cywiki
-  - cywikibooks
-  - cywikiquote
-  - cywikisource
-  - cywiktionary
-  - dawiki
-  - dawikibooks
-  - dawikiquote
-  - dawikisource
-  - dawiktionary
-  - dewiki
-  - dewikibooks
-  - dewikinews
-  - dewikiquote
-  - dewikisource
-  - dewikiversity
-  - dewikivoyage
-  - dewiktionary
-  - diqwiki
-  - dkwikimedia
-  - donatewiki
-  - dsbwiki
-  - dtywiki
-  - dvwiki
-  - dvwiktionary
-  - dzwiki
-  - dzwiktionary
-  - eewiki
-  - elwiki
-  - elwikibooks
-  - elwikinews
-  - elwikiquote
-  - elwikisource
-  - elwikiversity
-  - elwikivoyage
-  - elwiktionary
-  - emlwiki
-  - enwikibooks
-  - enwikinews
-  - enwikisource
-  - enwikiversity
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dumps: Turn off dumps auto-sync to labstore1006 for reimaging

2017-11-30 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394415 )

Change subject: dumps: Turn off dumps auto-sync to labstore1006 for reimaging
..


dumps: Turn off dumps auto-sync to labstore1006 for reimaging

This patch can be reverted after the reimaging

Change-Id: Ia3319967d2d52fae725c12be2eedbb0b6d1cdc13
---
M modules/profile/manifests/dumps/generation/server/primary.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp 
b/modules/profile/manifests/dumps/generation/server/primary.pp
index 5ac8ce5..b932336 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -11,8 +11,8 @@
 
 class { '::dumps::generation::server::rsyncer':
 xmldumpsdir=> '/data/xmldatadumps',
-xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/,labstore1006.wikimedia.org::data/xmldatadumps/public/',
+xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/',
 miscdumpsdir   => '/data/otherdumps',
-miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/,labstore1006.wikimedia.org::data/xmldatadumps/public/other/',
+miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/',
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3319967d2d52fae725c12be2eedbb0b6d1cdc13
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: dumps: Turn off dumps auto-sync to labstore1006 for reimaging

2017-11-30 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394415 )

Change subject: dumps: Turn off dumps auto-sync to labstore1006 for reimaging
..

dumps: Turn off dumps auto-sync to labstore1006 for reimaging

This patch can be reverted after the reimaging

Change-Id: Ia3319967d2d52fae725c12be2eedbb0b6d1cdc13
---
M modules/profile/manifests/dumps/generation/server/primary.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/394415/1

diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp 
b/modules/profile/manifests/dumps/generation/server/primary.pp
index 5ac8ce5..b932336 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -11,8 +11,8 @@
 
 class { '::dumps::generation::server::rsyncer':
 xmldumpsdir=> '/data/xmldatadumps',
-xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/,labstore1006.wikimedia.org::data/xmldatadumps/public/',
+xmlremotedirs  => 
'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/',
 miscdumpsdir   => '/data/otherdumps',
-miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/,labstore1006.wikimedia.org::data/xmldatadumps/public/other/',
+miscremotedirs => 
'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/',
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: public_dumps: Revert inclusion of labstore::init class

2017-11-29 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394224 )

Change subject: public_dumps: Revert inclusion of labstore::init class
..


public_dumps: Revert inclusion of labstore::init class

Including the labstore::init class brought with it a bunch of
ldap client libraries and config that are not needed in these servers
since they will be read only NFS servers. Reverting this in puppet
first, and then will purge all the packages and config changes that
came with this.

Bug: T181431
Change-Id: I32df1e0480368286973eca41e5cd70c5f6e9ce27
---
M hieradata/hosts/labstore1006.yaml
M hieradata/hosts/labstore1007.yaml
M modules/profile/manifests/dumps/public_server.pp
3 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/hieradata/hosts/labstore1006.yaml 
b/hieradata/hosts/labstore1006.yaml
index 35bcdc1..c74bbdb 100644
--- a/hieradata/hosts/labstore1006.yaml
+++ b/hieradata/hosts/labstore1006.yaml
@@ -1,4 +1,3 @@
-ldap::client::nss::nsswitch_conf_source: 
file:///usr/share/base-files/nsswitch.conf
 profile::dumps::rsyncer:
   dumps_user: 'dumpsgen'
   dumps_group: 'dumpsgen'
diff --git a/hieradata/hosts/labstore1007.yaml 
b/hieradata/hosts/labstore1007.yaml
index 35bcdc1..c74bbdb 100644
--- a/hieradata/hosts/labstore1007.yaml
+++ b/hieradata/hosts/labstore1007.yaml
@@ -1,4 +1,3 @@
-ldap::client::nss::nsswitch_conf_source: 
file:///usr/share/base-files/nsswitch.conf
 profile::dumps::rsyncer:
   dumps_user: 'dumpsgen'
   dumps_group: 'dumpsgen'
diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
index f841c39..25defd1 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
 class profile::dumps::public_server {
 
 class {'::public_dumps::server':}
-class {'::labstore':}
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32df1e0480368286973eca41e5cd70c5f6e9ce27
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
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]: public_dumps: Revert inclusion of labstore::init class

2017-11-29 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394224 )

Change subject: public_dumps: Revert inclusion of labstore::init class
..

public_dumps: Revert inclusion of labstore::init class

Including the labstore::init class brought with it a bunch of
ldap client libraries and config that are not needed in these servers
since they will be read only NFS servers. Reverting this in puppet
first, and then will purge all the packages and config changes that
came with this.

Bug: T181431
Change-Id: I32df1e0480368286973eca41e5cd70c5f6e9ce27
---
M hieradata/hosts/labstore1006.yaml
M hieradata/hosts/labstore1007.yaml
M modules/profile/manifests/dumps/public_server.pp
3 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/394224/1

diff --git a/hieradata/hosts/labstore1006.yaml 
b/hieradata/hosts/labstore1006.yaml
index 35bcdc1..c74bbdb 100644
--- a/hieradata/hosts/labstore1006.yaml
+++ b/hieradata/hosts/labstore1006.yaml
@@ -1,4 +1,3 @@
-ldap::client::nss::nsswitch_conf_source: 
file:///usr/share/base-files/nsswitch.conf
 profile::dumps::rsyncer:
   dumps_user: 'dumpsgen'
   dumps_group: 'dumpsgen'
diff --git a/hieradata/hosts/labstore1007.yaml 
b/hieradata/hosts/labstore1007.yaml
index 35bcdc1..c74bbdb 100644
--- a/hieradata/hosts/labstore1007.yaml
+++ b/hieradata/hosts/labstore1007.yaml
@@ -1,4 +1,3 @@
-ldap::client::nss::nsswitch_conf_source: 
file:///usr/share/base-files/nsswitch.conf
 profile::dumps::rsyncer:
   dumps_user: 'dumpsgen'
   dumps_group: 'dumpsgen'
diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
index f841c39..25defd1 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
 class profile::dumps::public_server {
 
 class {'::public_dumps::server':}
-class {'::labstore':}
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add ldap client nsswitch config file to labstore1006|7 hiera

2017-11-28 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393821 )

Change subject: Add ldap client nsswitch config file to labstore1006|7 hiera
..


Add ldap client nsswitch config file to labstore1006|7 hiera

This was missing when applying the labstore::init class to the
servers, which may be causing puppet failures

Bug: T181431
Change-Id: If81a8c9154adf15f80f8e331f6f6e999ea8185cb
---
M hieradata/hosts/labstore1006.yaml
M hieradata/hosts/labstore1007.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/labstore1006.yaml 
b/hieradata/hosts/labstore1006.yaml
index c74bbdb..35bcdc1 100644
--- a/hieradata/hosts/labstore1006.yaml
+++ b/hieradata/hosts/labstore1006.yaml
@@ -1,3 +1,4 @@
+ldap::client::nss::nsswitch_conf_source: 
file:///usr/share/base-files/nsswitch.conf
 profile::dumps::rsyncer:
   dumps_user: 'dumpsgen'
   dumps_group: 'dumpsgen'
diff --git a/hieradata/hosts/labstore1007.yaml 
b/hieradata/hosts/labstore1007.yaml
index c74bbdb..35bcdc1 100644
--- a/hieradata/hosts/labstore1007.yaml
+++ b/hieradata/hosts/labstore1007.yaml
@@ -1,3 +1,4 @@
+ldap::client::nss::nsswitch_conf_source: 
file:///usr/share/base-files/nsswitch.conf
 profile::dumps::rsyncer:
   dumps_user: 'dumpsgen'
   dumps_group: 'dumpsgen'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If81a8c9154adf15f80f8e331f6f6e999ea8185cb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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 ldap client nsswitch config file to labstore1006|7 hiera

2017-11-28 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393821 )

Change subject: Add ldap client nsswitch config file to labstore1006|7 hiera
..

Add ldap client nsswitch config file to labstore1006|7 hiera

This was missing when applying the labstore::init class to the
servers, which may be causing puppet failures

Bug: T181431
Change-Id: If81a8c9154adf15f80f8e331f6f6e999ea8185cb
---
M hieradata/hosts/labstore1006.yaml
M hieradata/hosts/labstore1007.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/393821/1

diff --git a/hieradata/hosts/labstore1006.yaml 
b/hieradata/hosts/labstore1006.yaml
index c74bbdb..35bcdc1 100644
--- a/hieradata/hosts/labstore1006.yaml
+++ b/hieradata/hosts/labstore1006.yaml
@@ -1,3 +1,4 @@
+ldap::client::nss::nsswitch_conf_source: 
file:///usr/share/base-files/nsswitch.conf
 profile::dumps::rsyncer:
   dumps_user: 'dumpsgen'
   dumps_group: 'dumpsgen'
diff --git a/hieradata/hosts/labstore1007.yaml 
b/hieradata/hosts/labstore1007.yaml
index c74bbdb..35bcdc1 100644
--- a/hieradata/hosts/labstore1007.yaml
+++ b/hieradata/hosts/labstore1007.yaml
@@ -1,3 +1,4 @@
+ldap::client::nss::nsswitch_conf_source: 
file:///usr/share/base-files/nsswitch.conf
 profile::dumps::rsyncer:
   dumps_user: 'dumpsgen'
   dumps_group: 'dumpsgen'

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "public_dumps: Add puppet class to set up NFS for dum...

2017-11-28 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393818 )

Change subject: Revert "public_dumps: Add puppet class to set up NFS for dumps 
servers"
..


Revert "public_dumps: Add puppet class to set up NFS for dumps servers"

This reverts commit 7374a210104d27909d8fa20d50d096f1f17a14a6.

Change-Id: I63c2a29d7499008404c519cd1a73967546b4b1bc
---
M modules/profile/manifests/dumps/public_server.pp
D modules/public_dumps/files/nfs-common
D modules/public_dumps/files/nfs-kernel-server
D modules/public_dumps/manifests/nfs.pp
4 files changed, 1 insertion(+), 78 deletions(-)

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



diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
index f0e95d9..f841c39 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
 class profile::dumps::public_server {
 
 class {'::public_dumps::server':}
-class {'::public_dumps::nfs':}
+class {'::labstore':}
 }
diff --git a/modules/public_dumps/files/nfs-common 
b/modules/public_dumps/files/nfs-common
deleted file mode 100644
index cd91678..000
--- a/modules/public_dumps/files/nfs-common
+++ /dev/null
@@ -1,17 +0,0 @@
-# If you do not set values for the NEED_ options, they will be attempted
-# autodetected; this should be sufficient for most people. Valid alternatives
-# for the NEED_ options are "yes" and "no".
-
-# Do you want to start the statd daemon? It is not needed for NFSv4.
-NEED_STATD=yes
-
-# Options for rpc.statd.
-#   Should rpc.statd listen on a specific port? This is especially useful
-#   when you have a port-based firewall. To use a fixed port, set this
-#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
-#   For more information, see rpc.statd(8) or 
http://wiki.debian.org/SecuringNFS
-STATDOPTS='--port 55659 --outgoing-port 44153'
-
-# Do you want to start the gssd daemon? It is required for Kerberos mounts.
-NEED_GSSD=
-NEED_LOCKD=no
diff --git a/modules/public_dumps/files/nfs-kernel-server 
b/modules/public_dumps/files/nfs-kernel-server
deleted file mode 100644
index bfb4950..000
--- a/modules/public_dumps/files/nfs-kernel-server
+++ /dev/null
@@ -1,23 +0,0 @@
-# Number of servers to start up
-# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
-
-# Best as max concurrently connected clients.  We currently hover around
-# 250-280 connected clients as of 1/25/2016
-RPCNFSDCOUNT=192
-
-# Runtime priority of server (see nice(1))
-RPCNFSDPRIORITY=0
-
-# Options for rpc.mountd.
-# If you have a port-based firewall, you might want to set up
-# a fixed port here using the --port option. For more information,
-# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
-# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
-RPCMOUNTDOPTS='--manage-gids --port 38466 --no-nfs-version 2,3'
-
-# Do you want to start the svcgssd daemon? It is only required for Kerberos
-# exports. Valid alternatives are "yes" and "no"; the default is "no".
-NEED_SVCGSSD=
-
-# Options for rpc.svcgssd.
-RPCSVCGSSDOPTS=
diff --git a/modules/public_dumps/manifests/nfs.pp 
b/modules/public_dumps/manifests/nfs.pp
deleted file mode 100644
index 3586906..000
--- a/modules/public_dumps/manifests/nfs.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Set up NFS Server for the public dumps servers
-# Firewall rules are managed separately through profile::wmcs::nfs::ferm
-
-class public_dumps::nfs {
-
-require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
-
-file { '/etc/default/nfs-common':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/public_dumps/nfs-common',
-}
-
-file { '/etc/default/nfs-kernel-server':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/public_dumps/nfs-kernel-server',
-}
-
-file { '/etc/modprobe.d/nfs-lockd.conf':
-ensure  => present,
-owner   => 'root',
-group   => 'root',
-mode=> '0644',
-content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
-}
-
-# Manage state manually
-service { 'nfs-kernel-server':
-enable => false,
-}
-
-}

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

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

___

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "public_dumps: Add puppet class to set up NFS for dum...

2017-11-28 Thread Madhuvishy (Code Review) 
Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "public_dumps: Add puppet class to set up NFS for dumps 
servers"
..

Revert "public_dumps: Add puppet class to set up NFS for dumps servers"

This reverts commit 7374a210104d27909d8fa20d50d096f1f17a14a6.

Change-Id: I63c2a29d7499008404c519cd1a73967546b4b1bc
---
M modules/profile/manifests/dumps/public_server.pp
D modules/public_dumps/files/nfs-common
D modules/public_dumps/files/nfs-kernel-server
D modules/public_dumps/manifests/nfs.pp
4 files changed, 1 insertion(+), 78 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/393818/1

diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
index f0e95d9..f841c39 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
 class profile::dumps::public_server {
 
 class {'::public_dumps::server':}
-class {'::public_dumps::nfs':}
+class {'::labstore':}
 }
diff --git a/modules/public_dumps/files/nfs-common 
b/modules/public_dumps/files/nfs-common
deleted file mode 100644
index cd91678..000
--- a/modules/public_dumps/files/nfs-common
+++ /dev/null
@@ -1,17 +0,0 @@
-# If you do not set values for the NEED_ options, they will be attempted
-# autodetected; this should be sufficient for most people. Valid alternatives
-# for the NEED_ options are "yes" and "no".
-
-# Do you want to start the statd daemon? It is not needed for NFSv4.
-NEED_STATD=yes
-
-# Options for rpc.statd.
-#   Should rpc.statd listen on a specific port? This is especially useful
-#   when you have a port-based firewall. To use a fixed port, set this
-#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
-#   For more information, see rpc.statd(8) or 
http://wiki.debian.org/SecuringNFS
-STATDOPTS='--port 55659 --outgoing-port 44153'
-
-# Do you want to start the gssd daemon? It is required for Kerberos mounts.
-NEED_GSSD=
-NEED_LOCKD=no
diff --git a/modules/public_dumps/files/nfs-kernel-server 
b/modules/public_dumps/files/nfs-kernel-server
deleted file mode 100644
index bfb4950..000
--- a/modules/public_dumps/files/nfs-kernel-server
+++ /dev/null
@@ -1,23 +0,0 @@
-# Number of servers to start up
-# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
-
-# Best as max concurrently connected clients.  We currently hover around
-# 250-280 connected clients as of 1/25/2016
-RPCNFSDCOUNT=192
-
-# Runtime priority of server (see nice(1))
-RPCNFSDPRIORITY=0
-
-# Options for rpc.mountd.
-# If you have a port-based firewall, you might want to set up
-# a fixed port here using the --port option. For more information,
-# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
-# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
-RPCMOUNTDOPTS='--manage-gids --port 38466 --no-nfs-version 2,3'
-
-# Do you want to start the svcgssd daemon? It is only required for Kerberos
-# exports. Valid alternatives are "yes" and "no"; the default is "no".
-NEED_SVCGSSD=
-
-# Options for rpc.svcgssd.
-RPCSVCGSSDOPTS=
diff --git a/modules/public_dumps/manifests/nfs.pp 
b/modules/public_dumps/manifests/nfs.pp
deleted file mode 100644
index 3586906..000
--- a/modules/public_dumps/manifests/nfs.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Set up NFS Server for the public dumps servers
-# Firewall rules are managed separately through profile::wmcs::nfs::ferm
-
-class public_dumps::nfs {
-
-require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
-
-file { '/etc/default/nfs-common':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/public_dumps/nfs-common',
-}
-
-file { '/etc/default/nfs-kernel-server':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/public_dumps/nfs-kernel-server',
-}
-
-file { '/etc/modprobe.d/nfs-lockd.conf':
-ensure  => present,
-owner   => 'root',
-group   => 'root',
-mode=> '0644',
-content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
-}
-
-# Manage state manually
-service { 'nfs-kernel-server':
-enable => false,
-}
-
-}

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: public_dumps: Add puppet class to set up NFS for dumps servers

2017-11-27 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393695 )

Change subject: public_dumps: Add puppet class to set up NFS for dumps servers
..


public_dumps: Add puppet class to set up NFS for dumps servers

Bug: T181431
Change-Id: I068f639e3b5a544af288408d90558a85c8287f72
---
M modules/profile/manifests/dumps/public_server.pp
A modules/public_dumps/files/nfs-common
A modules/public_dumps/files/nfs-kernel-server
A modules/public_dumps/manifests/nfs.pp
4 files changed, 78 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
index f841c39..f0e95d9 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
 class profile::dumps::public_server {
 
 class {'::public_dumps::server':}
-class {'::labstore':}
+class {'::public_dumps::nfs':}
 }
diff --git a/modules/public_dumps/files/nfs-common 
b/modules/public_dumps/files/nfs-common
new file mode 100644
index 000..cd91678
--- /dev/null
+++ b/modules/public_dumps/files/nfs-common
@@ -0,0 +1,17 @@
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=yes
+
+# Options for rpc.statd.
+#   Should rpc.statd listen on a specific port? This is especially useful
+#   when you have a port-based firewall. To use a fixed port, set this
+#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
+#   For more information, see rpc.statd(8) or 
http://wiki.debian.org/SecuringNFS
+STATDOPTS='--port 55659 --outgoing-port 44153'
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=
+NEED_LOCKD=no
diff --git a/modules/public_dumps/files/nfs-kernel-server 
b/modules/public_dumps/files/nfs-kernel-server
new file mode 100644
index 000..bfb4950
--- /dev/null
+++ b/modules/public_dumps/files/nfs-kernel-server
@@ -0,0 +1,23 @@
+# Number of servers to start up
+# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
+
+# Best as max concurrently connected clients.  We currently hover around
+# 250-280 connected clients as of 1/25/2016
+RPCNFSDCOUNT=192
+
+# Runtime priority of server (see nice(1))
+RPCNFSDPRIORITY=0
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option. For more information,
+# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
+# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
+RPCMOUNTDOPTS='--manage-gids --port 38466 --no-nfs-version 2,3'
+
+# Do you want to start the svcgssd daemon? It is only required for Kerberos
+# exports. Valid alternatives are "yes" and "no"; the default is "no".
+NEED_SVCGSSD=
+
+# Options for rpc.svcgssd.
+RPCSVCGSSDOPTS=
diff --git a/modules/public_dumps/manifests/nfs.pp 
b/modules/public_dumps/manifests/nfs.pp
new file mode 100644
index 000..3586906
--- /dev/null
+++ b/modules/public_dumps/manifests/nfs.pp
@@ -0,0 +1,37 @@
+# Set up NFS Server for the public dumps servers
+# Firewall rules are managed separately through profile::wmcs::nfs::ferm
+
+class public_dumps::nfs {
+
+require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
+
+file { '/etc/default/nfs-common':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/public_dumps/nfs-common',
+}
+
+file { '/etc/default/nfs-kernel-server':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/public_dumps/nfs-kernel-server',
+}
+
+file { '/etc/modprobe.d/nfs-lockd.conf':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
+}
+
+# Manage state manually
+service { 'nfs-kernel-server':
+enable => false,
+}
+
+}

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] operations/puppet[production]: public_dumps: Add puppet class to set up NFS for dumps servers

2017-11-27 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393695 )

Change subject: public_dumps: Add puppet class to set up NFS for dumps servers
..

public_dumps: Add puppet class to set up NFS for dumps servers

Bug: T181431
Change-Id: I068f639e3b5a544af288408d90558a85c8287f72
---
M modules/profile/manifests/dumps/public_server.pp
A modules/public_dumps/files/nfs-common
A modules/public_dumps/files/nfs-kernel-server
A modules/public_dumps/manifests/nfs.pp
4 files changed, 78 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/393695/1

diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
index f841c39..f0e95d9 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
 class profile::dumps::public_server {
 
 class {'::public_dumps::server':}
-class {'::labstore':}
+class {'::public_dumps::nfs':}
 }
diff --git a/modules/public_dumps/files/nfs-common 
b/modules/public_dumps/files/nfs-common
new file mode 100644
index 000..cd91678
--- /dev/null
+++ b/modules/public_dumps/files/nfs-common
@@ -0,0 +1,17 @@
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=yes
+
+# Options for rpc.statd.
+#   Should rpc.statd listen on a specific port? This is especially useful
+#   when you have a port-based firewall. To use a fixed port, set this
+#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
+#   For more information, see rpc.statd(8) or 
http://wiki.debian.org/SecuringNFS
+STATDOPTS='--port 55659 --outgoing-port 44153'
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=
+NEED_LOCKD=no
diff --git a/modules/public_dumps/files/nfs-kernel-server 
b/modules/public_dumps/files/nfs-kernel-server
new file mode 100644
index 000..bfb4950
--- /dev/null
+++ b/modules/public_dumps/files/nfs-kernel-server
@@ -0,0 +1,23 @@
+# Number of servers to start up
+# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
+
+# Best as max concurrently connected clients.  We currently hover around
+# 250-280 connected clients as of 1/25/2016
+RPCNFSDCOUNT=192
+
+# Runtime priority of server (see nice(1))
+RPCNFSDPRIORITY=0
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option. For more information,
+# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
+# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
+RPCMOUNTDOPTS='--manage-gids --port 38466 --no-nfs-version 2,3'
+
+# Do you want to start the svcgssd daemon? It is only required for Kerberos
+# exports. Valid alternatives are "yes" and "no"; the default is "no".
+NEED_SVCGSSD=
+
+# Options for rpc.svcgssd.
+RPCSVCGSSDOPTS=
diff --git a/modules/public_dumps/manifests/nfs.pp 
b/modules/public_dumps/manifests/nfs.pp
new file mode 100644
index 000..3586906
--- /dev/null
+++ b/modules/public_dumps/manifests/nfs.pp
@@ -0,0 +1,37 @@
+# Set up NFS Server for the public dumps servers
+# Firewall rules are managed separately through profile::wmcs::nfs::ferm
+
+class public_dumps::nfs {
+
+require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
+
+file { '/etc/default/nfs-common':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/public_dumps/nfs-common',
+}
+
+file { '/etc/default/nfs-kernel-server':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/public_dumps/nfs-kernel-server',
+}
+
+file { '/etc/modprobe.d/nfs-lockd.conf':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
+}
+
+# Manage state manually
+service { 'nfs-kernel-server':
+enable => false,
+}
+
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: public_dumps: Set up NFS on the dumps servers

2017-11-27 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393680 )

Change subject: public_dumps: Set up NFS on the dumps servers
..


public_dumps: Set up NFS on the dumps servers

Bug: T181431
Change-Id: I4cb40fd76c83582c0d2e946707891278d3e1c65e
---
M modules/profile/manifests/dumps/public_server.pp
M modules/role/manifests/dumps/public/server.pp
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
index 25defd1..f841c39 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
 class profile::dumps::public_server {
 
 class {'::public_dumps::server':}
-
+class {'::labstore':}
 }
diff --git a/modules/role/manifests/dumps/public/server.pp 
b/modules/role/manifests/dumps/public/server.pp
index 4396293..d1a46b9 100644
--- a/modules/role/manifests/dumps/public/server.pp
+++ b/modules/role/manifests/dumps/public/server.pp
@@ -3,6 +3,7 @@
 
 include ::standard
 include ::profile::base::firewall
+include ::profile::wmcs::nfs::ferm
 include ::profile::dumps::public_server
 include ::profile::dumps::web::rsync_server
 include ::profile::dumps::rsyncer

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cb40fd76c83582c0d2e946707891278d3e1c65e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: public_dumps: Set up NFS on the dumps servers

2017-11-27 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393680 )

Change subject: public_dumps: Set up NFS on the dumps servers
..

public_dumps: Set up NFS on the dumps servers

Bug: T181431
Change-Id: I4cb40fd76c83582c0d2e946707891278d3e1c65e
---
M modules/profile/manifests/dumps/public_server.pp
M modules/role/manifests/dumps/public/server.pp
2 files changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
index 25defd1..f841c39 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
 class profile::dumps::public_server {
 
 class {'::public_dumps::server':}
-
+class {'::labstore':}
 }
diff --git a/modules/role/manifests/dumps/public/server.pp 
b/modules/role/manifests/dumps/public/server.pp
index 4396293..d1a46b9 100644
--- a/modules/role/manifests/dumps/public/server.pp
+++ b/modules/role/manifests/dumps/public/server.pp
@@ -3,6 +3,7 @@
 
 include ::standard
 include ::profile::base::firewall
+include ::profile::wmcs::nfs::ferm
 include ::profile::dumps::public_server
 include ::profile::dumps::web::rsync_server
 include ::profile::dumps::rsyncer

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: initial ferm rules shared by all labstore hosts

2017-11-27 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/353508 )

Change subject: labstore: initial ferm rules shared by all labstore hosts
..


labstore: initial ferm rules shared by all labstore hosts

rpcbind and NFS itself use a common port for all labstore NFS classes.

(Not yet included in the labstore roles at this point)

Bug: T165136
Change-Id: I4bdd1eb9285c311041ac4501c4f7a1693066dc7f
---
A modules/profile/manifests/wmcs/nfs/ferm.pp
1 file changed, 40 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/wmcs/nfs/ferm.pp 
b/modules/profile/manifests/wmcs/nfs/ferm.pp
new file mode 100644
index 000..41b76cb
--- /dev/null
+++ b/modules/profile/manifests/wmcs/nfs/ferm.pp
@@ -0,0 +1,40 @@
+# Common ferm class for labstore servers.
+
+class profile::wmcs::nfs::ferm {
+
+ferm::service { 'labstore_nfs_portmapper_udp':
+proto  => 'udp',
+port   => '111',
+srange => '$LABS_NETWORKS',
+}
+
+ferm::service { 'labstore_nfs_portmapper_tcp':
+proto  => 'tcp',
+port   => '111',
+srange => '$LABS_NETWORKS',
+}
+
+ferm::service { 'labstore_nfs_nfs_service':
+proto  => 'tcp',
+port   => '2049',
+srange => '$LABS_NETWORKS',
+}
+
+ferm::service { 'labstore_nfs_rpc_statd_tcp':
+proto  => 'tcp',
+port   => '55659',
+srange => '$LABS_NETWORKS',
+}
+
+ferm::service { 'labstore_nfs_rpc_statd_udp':
+proto  => 'udp',
+port   => '55659',
+srange => '$LABS_NETWORKS',
+}
+
+ferm::service { 'labstore_nfs_rpc_mountd':
+proto  => 'tcp',
+port   => '38466',
+srange => '$LABS_NETWORKS',
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4bdd1eb9285c311041ac4501c4f7a1693066dc7f
Gerrit-PatchSet: 14
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
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]: nfs_mount: Remove showmount based blocking check for nfs shares

2017-11-16 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391970 )

Change subject: nfs_mount: Remove showmount based blocking check for nfs shares
..


nfs_mount: Remove showmount based blocking check for nfs shares

This change removes the check, the block parameter, and references
to it. It also removes the block-for-export script.

Bug: T171508
Change-Id: I321c0316e3118eeffea24e79978985bad45d249f
---
D modules/labstore/files/block-for-export
M modules/labstore/manifests/nfs_mount.pp
M modules/role/manifests/labs/nfsclient.pp
3 files changed, 0 insertions(+), 60 deletions(-)

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



diff --git a/modules/labstore/files/block-for-export 
b/modules/labstore/files/block-for-export
deleted file mode 100644
index dd8c9e7..000
--- a/modules/labstore/files/block-for-export
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# This file is installed by puppet.
-#
-#  Block until a specified volume is available.  This
-#  is used during a puppet run to prevent premature config
-#  of a non-existent volume.
-#
-#  Args are server, volpath, timeout in seconds.  Example:
-#
-# block-for-export labstore.svc.eqiad.wmnet project/testlabs 120
-#
-set -u
-
-NFS_SERVER=$1
-VOLUME=$2
-TIMEOUT=$3
-
-if [ "$#" -ne 3 ]; then
-echo "Usage:  ${0}   "
-exit 1
-fi
-
-# query openstack metadata service
-ip=`curl http://169.254.169.254/1.0/meta-data/local-ipv4 2> /dev/null`
-domain=`hostname -d | sed -r 's/.*\.([^.]+\.[^.]+)$/\1/'`
-for i in `seq 1 ${TIMEOUT}`; do
-prod_domain=`echo $domain | sed 's/wmflabs/wmnet/'`
-echo $(showmount -e ${NFS_SERVER} | egrep ^/exp/${VOLUME}\\s), | fgrep -q 
$ip,
-if [ $? -eq 0 ];  then
-exit 0
-fi
-sleep 1
-done
-
-exit 2
diff --git a/modules/labstore/manifests/nfs_mount.pp 
b/modules/labstore/manifests/nfs_mount.pp
index a722f89..094f8de 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -27,9 +27,6 @@
 # [*options]
 #  Array of options to combine with the standard options
 #
-# [*block]
-#  boolean to determine if we should block to wait for share
-#
 # [*block_timeout]
 #  timeout to block for share availability
 
@@ -41,7 +38,6 @@
 $share_path = undef,
 $server = undef,
 $options = [],
-$block=false,
 $block_timeout = 180,
 $lookupcache='none',
 )
@@ -129,24 +125,6 @@
 }
 
 if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
-
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/labstore/block-for-export',
-}
-}
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
-unless  => "/bin/mountpoint -q ${mount_path}",
-}
-}
 
 # 'present' is meant to manage only the status of entries in /etc/fstab
 # a notable exception to this is in the case of an entry managed as 
'present'
diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index baa33db..28cfcc9 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -10,7 +10,6 @@
 mount_path  => '/mnt/nfs/labstore-secondary-project',
 share_path  => "/project/${::labsproject}/project",
 server  => 'nfs-tools-project.svc.eqiad.wmnet',
-block   => true,
 lookupcache => $lookupcache,
 }
 
@@ -21,7 +20,6 @@
 mount_path  => '/mnt/nfs/labstore-secondary-home',
 share_path  => "/project/${::labsproject}/home",
 server  => 'nfs-tools-project.svc.eqiad.wmnet',
-block   => true,
 lookupcache => $lookupcache,
 }
 

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

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

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs_mount: Remove showmount based blocking check for nfs shares

2017-11-16 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391970 )

Change subject: nfs_mount: Remove showmount based blocking check for nfs shares
..

nfs_mount: Remove showmount based blocking check for nfs shares

This change removes the check, the block parameter, and references
to it. It also removes the block-for-export script.

Bug: T171508
Change-Id: I321c0316e3118eeffea24e79978985bad45d249f
---
D modules/labstore/files/block-for-export
M modules/labstore/manifests/nfs_mount.pp
M modules/role/manifests/labs/nfsclient.pp
3 files changed, 0 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/391970/1

diff --git a/modules/labstore/files/block-for-export 
b/modules/labstore/files/block-for-export
deleted file mode 100644
index dd8c9e7..000
--- a/modules/labstore/files/block-for-export
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# This file is installed by puppet.
-#
-#  Block until a specified volume is available.  This
-#  is used during a puppet run to prevent premature config
-#  of a non-existent volume.
-#
-#  Args are server, volpath, timeout in seconds.  Example:
-#
-# block-for-export labstore.svc.eqiad.wmnet project/testlabs 120
-#
-set -u
-
-NFS_SERVER=$1
-VOLUME=$2
-TIMEOUT=$3
-
-if [ "$#" -ne 3 ]; then
-echo "Usage:  ${0}   "
-exit 1
-fi
-
-# query openstack metadata service
-ip=`curl http://169.254.169.254/1.0/meta-data/local-ipv4 2> /dev/null`
-domain=`hostname -d | sed -r 's/.*\.([^.]+\.[^.]+)$/\1/'`
-for i in `seq 1 ${TIMEOUT}`; do
-prod_domain=`echo $domain | sed 's/wmflabs/wmnet/'`
-echo $(showmount -e ${NFS_SERVER} | egrep ^/exp/${VOLUME}\\s), | fgrep -q 
$ip,
-if [ $? -eq 0 ];  then
-exit 0
-fi
-sleep 1
-done
-
-exit 2
diff --git a/modules/labstore/manifests/nfs_mount.pp 
b/modules/labstore/manifests/nfs_mount.pp
index a722f89..094f8de 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -27,9 +27,6 @@
 # [*options]
 #  Array of options to combine with the standard options
 #
-# [*block]
-#  boolean to determine if we should block to wait for share
-#
 # [*block_timeout]
 #  timeout to block for share availability
 
@@ -41,7 +38,6 @@
 $share_path = undef,
 $server = undef,
 $options = [],
-$block=false,
 $block_timeout = 180,
 $lookupcache='none',
 )
@@ -129,24 +125,6 @@
 }
 
 if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
-
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/labstore/block-for-export',
-}
-}
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
-unless  => "/bin/mountpoint -q ${mount_path}",
-}
-}
 
 # 'present' is meant to manage only the status of entries in /etc/fstab
 # a notable exception to this is in the case of an entry managed as 
'present'
diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index baa33db..28cfcc9 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -10,7 +10,6 @@
 mount_path  => '/mnt/nfs/labstore-secondary-project',
 share_path  => "/project/${::labsproject}/project",
 server  => 'nfs-tools-project.svc.eqiad.wmnet',
-block   => true,
 lookupcache => $lookupcache,
 }
 
@@ -21,7 +20,6 @@
 mount_path  => '/mnt/nfs/labstore-secondary-home',
 share_path  => "/project/${::labsproject}/home",
 server  => 'nfs-tools-project.svc.eqiad.wmnet',
-block   => true,
 lookupcache => $lookupcache,
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "nfsmount: Add temporary exception to the block-for-e...

2017-11-16 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391906 )

Change subject: Revert "nfsmount: Add temporary exception to the 
block-for-export check"
..


Revert "nfsmount: Add temporary exception to the block-for-export check"

This reverts commit bf8557d4450b1cecf33577c5cea743b5be1d74dd.

Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
---
M modules/labstore/manifests/nfs_mount.pp
1 file changed, 15 insertions(+), 21 deletions(-)

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



diff --git a/modules/labstore/manifests/nfs_mount.pp 
b/modules/labstore/manifests/nfs_mount.pp
index 6fc0af6..a722f89 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -130,30 +130,24 @@
 
 if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
 
-# This project!=testlabs check is a super temporary check put in place 
to
-# test new VM images that include alternative functionality to block 
until
-# all the mounts are available, that would deprecate the following 
showmount
-# based mechanism if it works correctly.
-# TODO: Revert this check after testing (T174590)
-if ($project != 'testlabs') {
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 
'puppet:///modules/labstore/block-for-export',
-}
-}
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
-unless  => "/bin/mountpoint -q ${mount_path}",
+if $block {
+if !defined(File['/usr/local/sbin/block-for-export']) {
+# This script will block until the NFS volume is available
+file { '/usr/local/sbin/block-for-export':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/labstore/block-for-export',
 }
 }
+exec { "block-for-nfs-${name}":
+command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
+require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
+unless  => "/bin/mountpoint -q ${mount_path}",
+}
 }
+
 # 'present' is meant to manage only the status of entries in /etc/fstab
 # a notable exception to this is in the case of an entry managed as 
'present'
 # puppet will attempt to remount that entry when options change /but/ 
only

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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 "nfsmount: Add temporary exception to the block-for-e...

2017-11-16 Thread Madhuvishy (Code Review) 
Hello Rush, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "nfsmount: Add temporary exception to the 
block-for-export check"
..

Revert "nfsmount: Add temporary exception to the block-for-export check"

This reverts commit bf8557d4450b1cecf33577c5cea743b5be1d74dd.

Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
---
M modules/labstore/manifests/nfs_mount.pp
1 file changed, 15 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/391906/1

diff --git a/modules/labstore/manifests/nfs_mount.pp 
b/modules/labstore/manifests/nfs_mount.pp
index 5ee1bad..c0ad900 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -130,30 +130,24 @@
 
 if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
 
-# This project!=testlabs check is a super temporary check put in place 
to
-# test new VM images that include alternative functionality to block 
until
-# all the mounts are available, that would deprecate the following 
showmount
-# based mechanism if it works correctly.
-# TODO: Revert this check after testing (T174590)
-if ($project != 'testlabs') {
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 
'puppet:///modules/labstore/block-for-export',
-}
-}
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
-unless  => "/bin/mountpoint -q ${mount_path}",
+if $block {
+if !defined(File['/usr/local/sbin/block-for-export']) {
+# This script will block until the NFS volume is available
+file { '/usr/local/sbin/block-for-export':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/labstore/block-for-export',
 }
 }
+exec { "block-for-nfs-${name}":
+command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
+require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
+unless  => "/bin/mountpoint -q ${mount_path}",
+}
 }
+
 # 'present' is meant to manage only the status of entries in /etc/fstab
 # a notable exception to this is in the case of an entry managed as 
'present'
 # puppet will attempt to remount that entry when options change /but/ 
only

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: public_dumps: Define directory for xmldatadumps

2017-11-16 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391892 )

Change subject: public_dumps: Define directory for xmldatadumps
..


public_dumps: Define directory for xmldatadumps

Bug: T171541
Change-Id: I5e603da717b00a88a740f288f10252e8d75ab9be
---
M modules/public_dumps/manifests/server.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/public_dumps/manifests/server.pp 
b/modules/public_dumps/manifests/server.pp
index 0bd796f..94e1429 100644
--- a/modules/public_dumps/manifests/server.pp
+++ b/modules/public_dumps/manifests/server.pp
@@ -14,4 +14,10 @@
 require => File['/srv/dumps'],
 }
 
+file {'/srv/dumps/xmldatadumps':
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e603da717b00a88a740f288f10252e8d75ab9be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: public_dumps: Define directory for xmldatadumps

2017-11-16 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391892 )

Change subject: public_dumps: Define directory for xmldatadumps
..

public_dumps: Define directory for xmldatadumps

Bug: T171541
Change-Id: I5e603da717b00a88a740f288f10252e8d75ab9be
---
M modules/public_dumps/manifests/server.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/391892/1

diff --git a/modules/public_dumps/manifests/server.pp 
b/modules/public_dumps/manifests/server.pp
index 0bd796f..94e1429 100644
--- a/modules/public_dumps/manifests/server.pp
+++ b/modules/public_dumps/manifests/server.pp
@@ -14,4 +14,10 @@
 require => File['/srv/dumps'],
 }
 
+file {'/srv/dumps/xmldatadumps':
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: bootstrapvz-stretch: Remove backports from sources

2017-11-15 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391741 )

Change subject: bootstrapvz-stretch: Remove backports from sources
..


bootstrapvz-stretch: Remove backports from sources

We have a new repository layout since
https://gerrit.wikimedia.org/r/#/c/357559/,
where backports in stretch has been folded into main,
and thirdparty is split out into different components and
must be added individually as needed.
Since https://gerrit.wikimedia.org/r/#/c/357616/,
stretch-wikimedia/backports no longer exists.
Removing them from sources in the bootstrapvz config for
stretch as a consequence.

Bug: T158583
Change-Id: I4ac3b7432b64529af1540d8fe16c7163d8370ba1
---
M modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Madhuvishy: Verified; Looks good to me, approved
  Dzahn: Looks good to me, but someone else must approve



diff --git a/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml 
b/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
index 304b204..8de5c21 100644
--- a/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
@@ -23,8 +23,8 @@
 packages:
   sources:
 wikimedia:
-  - deb  http://apt.wikimedia.org/wikimedia stretch-wikimedia main 
backports thirdparty
-  - deb-src http://apt.wikimedia.org/wikimedia stretch-wikimedia main 
backports thirdparty
+  - deb  http://apt.wikimedia.org/wikimedia stretch-wikimedia main
+  - deb-src http://apt.wikimedia.org/wikimedia stretch-wikimedia main
   trusted-keys:
 - /etc/apt/trusted.gpg
   install_standard: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ac3b7432b64529af1540d8fe16c7163d8370ba1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Madhuvishy 
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]: bootstrapvz-stretch: Remove backports from sources

2017-11-15 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391741 )

Change subject: bootstrapvz-stretch: Remove backports from sources
..

bootstrapvz-stretch: Remove backports from sources

We have a new repository layout since
https://gerrit.wikimedia.org/r/#/c/357559/,
where backports in stretch has been folded into main,
and thirdparty is split out into different components and
must be added individually as needed.
Since https://gerrit.wikimedia.org/r/#/c/357616/,
stretch-wikimedia/backports no longer exists.
Removing them from sources in the bootstrapvz config for
stretch as a consequence.

Bug: T158583
Change-Id: I4ac3b7432b64529af1540d8fe16c7163d8370ba1
---
M modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/391741/1

diff --git a/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml 
b/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
index 304b204..8de5c21 100644
--- a/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
@@ -23,8 +23,8 @@
 packages:
   sources:
 wikimedia:
-  - deb  http://apt.wikimedia.org/wikimedia stretch-wikimedia main 
backports thirdparty
-  - deb-src http://apt.wikimedia.org/wikimedia stretch-wikimedia main 
backports thirdparty
+  - deb  http://apt.wikimedia.org/wikimedia stretch-wikimedia main
+  - deb-src http://apt.wikimedia.org/wikimedia stretch-wikimedia main
   trusted-keys:
 - /etc/apt/trusted.gpg
   install_standard: true

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: bootstrapvz-stretch: Remove backports from sources

2017-11-15 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391740 )

Change subject: bootstrapvz-stretch: Remove backports from sources
..

bootstrapvz-stretch: Remove backports from sources

We have a new repository layout since
https://gerrit.wikimedia.org/r/#/c/357559/,
where backports in stretch has been folded into main,
and thirdparty is split out into different components and
must be added individually as needed.
Since https://gerrit.wikimedia.org/r/#/c/357616/,
stretch-wikimedia/backports no longer exists.
Removing them from sources in the bootstrapvz config for
stretch as a consequence.

Bug: T158583
Change-Id: I4ac3b7432b64529af1540d8fe16c7163d8370ba1

also remove thirdparty

Change-Id: Ib5ade2cc09ea9ec8837a9f6cefcb286009be5da1
---
M modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml 
b/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
index 304b204..8de5c21 100644
--- a/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-stretch.manifest.yaml
@@ -23,8 +23,8 @@
 packages:
   sources:
 wikimedia:
-  - deb  http://apt.wikimedia.org/wikimedia stretch-wikimedia main 
backports thirdparty
-  - deb-src http://apt.wikimedia.org/wikimedia stretch-wikimedia main 
backports thirdparty
+  - deb  http://apt.wikimedia.org/wikimedia stretch-wikimedia main
+  - deb-src http://apt.wikimedia.org/wikimedia stretch-wikimedia main
   trusted-keys:
 - /etc/apt/trusted.gpg
   install_standard: true

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ssh-key-ldap-lookup: Deny user auth if /etc/block-ldap-key-l...

2017-11-15 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384574 )

Change subject: ssh-key-ldap-lookup: Deny user auth if 
/etc/block-ldap-key-lookup exists
..


ssh-key-ldap-lookup: Deny user auth if /etc/block-ldap-key-lookup exists

The ssh-key-ldap-lookup authenticates a user to login via ssh if
their public key matches the one stored in ldap. This patch adds
an override mechanism to deny auth if a specific file -
/etc/block-ldap-key-lookup is present on the instance for non-root users.

This mechanism is similar to one provided by the PAM module nologin
(https://linux.die.net/man/8/pam_nologin) - which is the approach
that we tried first. However, even though the module is configured
correctly in our ssh config, it allows non-root users to login even
when the /etc/nologin files in some OS-es, sometimes.
Please see ticket linked for more information.

Bug: T171508
Change-Id: I24d22a168e9f1fa1c30154ec3231200d9f40d624
---
M modules/ldap/files/scripts/ssh-key-ldap-lookup
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/ldap/files/scripts/ssh-key-ldap-lookup 
b/modules/ldap/files/scripts/ssh-key-ldap-lookup
index 239fbdc..febf268 100755
--- a/modules/ldap/files/scripts/ssh-key-ldap-lookup
+++ b/modules/ldap/files/scripts/ssh-key-ldap-lookup
@@ -23,6 +23,7 @@
 import argparse
 import ldap
 import yaml
+import os.path
 import sys
 
 
@@ -91,6 +92,11 @@
 if args.username == 'root' and not args.enable_servicegroups:
 return
 
+# Deny authorization for non-root users if the /etc/block-ldap-key-lookup
+# file is present
+if os.path.isfile('/etc/block-ldap-key-lookup'):
+sys.exit(1)
+
 with open('/etc/ldap.yaml') as f:
 config = yaml.safe_load(f)
 
@@ -113,5 +119,6 @@
 # Some keys have an accidental newline at the end, see T77902
 print key.strip()
 
+
 if __name__ == '__main__':
 main()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24d22a168e9f1fa1c30154ec3231200d9f40d624
Gerrit-PatchSet: 12
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Madhuvishy 
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]: firstboot: Prevent non-root users from logging in during ins...

2017-11-15 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391619 )

Change subject: firstboot: Prevent non-root users from logging in during 
instance set up
..


firstboot: Prevent non-root users from logging in during instance set up

Bug: T171508
Change-Id: Id3afe6fb9668baf9598b08e79c566f0d7d1b2704
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 9 insertions(+), 6 deletions(-)

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



diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index abd6155..5dec237 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -3,7 +3,9 @@
 set -x
 
 # Prevent non-root logins while the VM is being setup
-echo "VM is work in progress" > /etc/nologin
+# The ssh-key-ldap-lookup script rejects non-root user logins if this file
+# is present.
+echo "VM is work in progress" > /etc/block-ldap-key-lookup
 
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
@@ -188,7 +190,7 @@
 until [ $mount_attempts -gt 10 ]
 do
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
-echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/block-ldap-key-lookup
 ((mount_attempts++))
 /usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
 # Sleep for 10s before next attempt
@@ -201,4 +203,4 @@
 puppet agent -t
 
 # Remove the non-root login restriction
-rm /etc/nologin
+rm /etc/block-ldap-key-lookup
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index 5971568..b674043 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -2,7 +2,8 @@
 set -x
 
 # Prevent non-root logins while the VM is being setup
-echo "VM is work in progress" > /etc/nologin
+# The ssh-key-ldap-lookup script rejects user logins when this file is present
+echo "VM is work in progress" > /etc/block-ldap-key-lookup
 
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
@@ -121,7 +122,7 @@
 until [ $mount_attempts -gt 10 ]
 do
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
-echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/block-ldap-key-lookup
 ((mount_attempts++))
 /usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
 # Sleep for 10s before next attempt
@@ -134,4 +135,4 @@
 puppet agent -t
 
 # Remove the non-root login restriction
-rm /etc/nologin
+rm /etc/block-ldap-key-lookup

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3afe6fb9668baf9598b08e79c566f0d7d1b2704
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: firstboot: Prevent non-root users from logging in during ins...

2017-11-15 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391619 )

Change subject: firstboot: Prevent non-root users from logging in during 
instance set up
..

firstboot: Prevent non-root users from logging in during instance set up

Bug: T171508
Change-Id: Id3afe6fb9668baf9598b08e79c566f0d7d1b2704
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 9 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/391619/1

diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index abd6155..5dec237 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -3,7 +3,9 @@
 set -x
 
 # Prevent non-root logins while the VM is being setup
-echo "VM is work in progress" > /etc/nologin
+# The ssh-key-ldap-lookup script rejects non-root user logins if this file
+# is present.
+echo "VM is work in progress" > /etc/block-ldap-key-lookup
 
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
@@ -188,7 +190,7 @@
 until [ $mount_attempts -gt 10 ]
 do
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
-echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/block-ldap-key-lookup
 ((mount_attempts++))
 /usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
 # Sleep for 10s before next attempt
@@ -201,4 +203,4 @@
 puppet agent -t
 
 # Remove the non-root login restriction
-rm /etc/nologin
+rm /etc/block-ldap-key-lookup
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index 5971568..b674043 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -2,7 +2,8 @@
 set -x
 
 # Prevent non-root logins while the VM is being setup
-echo "VM is work in progress" > /etc/nologin
+# The ssh-key-ldap-lookup script rejects user logins when this file is present
+echo "VM is work in progress" > /etc/block-ldap-key-lookup
 
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
@@ -121,7 +122,7 @@
 until [ $mount_attempts -gt 10 ]
 do
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
-echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/block-ldap-key-lookup
 ((mount_attempts++))
 /usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
 # Sleep for 10s before next attempt
@@ -134,4 +135,4 @@
 puppet agent -t
 
 # Remove the non-root login restriction
-rm /etc/nologin
+rm /etc/block-ldap-key-lookup

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

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

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

[MediaWiki-commits] [Gerrit] labs/private[master]: passwords: add labs key for arturo

2017-11-09 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390027 )

Change subject: passwords: add labs key for arturo
..


passwords: add labs key for arturo

Add labs SSH key for arturo.

Change-Id: Ieff0ca5f41f7cb24cdd1fb8620a8b1fc52f000e9
Signed-off-by: Arturo Borrero Gonzalez 
---
M modules/passwords/templates/root-authorized-keys.erb
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Madhuvishy: Verified; Looks good to me, approved
  BryanDavis: Looks good to me, but someone else must approve



diff --git a/modules/passwords/templates/root-authorized-keys.erb 
b/modules/passwords/templates/root-authorized-keys.erb
index dcbe031..7efbdec 100644
--- a/modules/passwords/templates/root-authorized-keys.erb
+++ b/modules/passwords/templates/root-authorized-keys.erb
@@ -34,4 +34,6 @@
 ssh-rsa 
B3NzaC1yc2EDAQABAAACAQDHO09HkC/OUk+sWmDx0O15qiQXPHMM97zEC19o7tc8mh4vGTXCzbcIGj2Z18thLQZ9e2N5hzr2vmcQ4gOkiPsHEiIQXtIUK6zomSqrV3qFryaFAd2FCynsK2/xS1Lw7WXy+uCgjnsc8nckQS3rsJzQswucAQmXno65tvg/t+UbJOKZpxIofZAWwsCcZfhnNt65Mtt4PGHPy+STfL3E3aj47xHMk/TqZv7bj4QR++NLu2qpWwwnnG7SWgoqS3x/2m/OU8ui3UxKWEMvZouIZVblY50E0OG+Xs/bcndLhqKl0FSVPQVVWh9ZPJKCHXVoc1Ja3ZFFNcgBmuC/XqjnsDCGlcKWKiW0CbWRzGrJ0BCkydOf72cDB4EseGV3KeZLbxfEUVt1EOYuDEEmAXQVXTTBX3A5vyq9C1Bx1H7wSmzVUImZfw09236+Lzqr98SWV+pHOglSHgYfDq8CEJxjIo8oADmAoGu9uclOQJ/7Sp0XigUgUE44SPMRKUymwC9TTrblKtUR49gyoVHMtnH1blTUqNwFt5dcvLtHMKzDeXAlWILhdcDP7Ys+VBwOXsJ+txSLiktiI4+CKgz4XMY58jmSKPkbMBEQjzFDhujpsybUdswMEd2GcSidqw338MsCNTgDGlUPmB5LV4LQl7zh+hlHqCgfxNhIl9+zwIuw5IlnYQ==
 # volans
 ssh-ed25519 
C3NzaC1lZDI1NTE5IJGEc35gnlkmFVNRpZPFpUD6BE0ztk81TiqKcJaaTWwG 
rcocci...@wikimedia.org
+# arturo
+ssh-rsa 
B3NzaC1yc2EDAQABAAABAQChjy08nJ0UH6KNRHLcYMUhTTSrpc+prSBG06vIsL5B/hW7IOjkX7lsRVrI0qsQQAARpR0VgY9UfOOW3ntfMEtLRJeAAlH3yLP6Y5F6yS+nQlSK3ng7qa6bPHKTbw19T08zpD+KCugbk13lWFifQRa+Auu4TA9PJ/wzy+490jSoj1xGUWkJTePsmYQzDLpN/ZafokEGO49fVpyZ+ZjvC9OF1QO0xndjAawku2siGTGIYYfXnfCFQdyPhAmC9a0PUlgDUG8a8MuDJw0lJCIvY/GqG6doAwijR+1wh4plWJ//x+bMY5DYhN145WTnuJpxA8GoowTrqpGocIjIJ3V7j6j/
 aborr...@wikimedia.org
 <%= @flat_extra_keys %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieff0ca5f41f7cb24cdd1fb8620a8b1fc52f000e9
Gerrit-PatchSet: 2
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Arturo Borrero Gonzalez 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Revert "labsdb: Switch dns for labsdb1001 to labsdb1...

2017-11-01 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387772 )

Change subject: Revert "Revert "labsdb: Switch dns for labsdb1001 to 
labsdb1003""
..


Revert "Revert "labsdb: Switch dns for labsdb1001 to labsdb1003""

Labsdb1001 seems to have crashed with storage issues

This reverts commit 2ef303cb3fd2352e67b4eb040c63a9ae8396f100.

Bug: T179464
Change-Id: I3090efa1032a8211996bcc700a0dad731d015046
---
M hieradata/common/profile/openstack/base/pdns/labsdb.yaml
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml 
b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
index 316aa0a..3bfe95b 100644
--- a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
@@ -4,9 +4,14 @@
 #  and can be adjusted to depool a server or redistribute load.
 
 profile::openstack::base::pdns::labsdb::c1:
+  - c1
+
+profile::openstack::base::pdns::labsdb::c2:
+  - c2
+
+profile::openstack::base::pdns::labsdb::c3:
   - bgwiki
   - bgwiktionary
-  - c1
   - commonswiki
   - cswiki
   - enwiki
@@ -27,11 +32,6 @@
   - thwiki
   - trwiki
   - zhwiki
-
-profile::openstack::base::pdns::labsdb::c2:
-  - c2
-
-profile::openstack::base::pdns::labsdb::c3:
   - aawiki
   - aawikibooks
   - aawiktionary

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3090efa1032a8211996bcc700a0dad731d015046
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Marostegui 
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 "Revert "labsdb: Switchover dns for labsdb1001 shards...

2017-11-01 Thread Madhuvishy (Code Review) 
Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "Revert "labsdb: Switchover dns for labsdb1001 shards to 
labsdb1003""
..

Revert "Revert "labsdb: Switchover dns for labsdb1001 shards to labsdb1003""

Labsdb1001 seems to have crashed with storage issues

Bug: T179464

This reverts commit 2ef303cb3fd2352e67b4eb040c63a9ae8396f100.

Change-Id: I3090efa1032a8211996bcc700a0dad731d015046
---
M hieradata/common/profile/openstack/base/pdns/labsdb.yaml
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/387772/1

diff --git a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml 
b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
index 316aa0a..3bfe95b 100644
--- a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
@@ -4,9 +4,14 @@
 #  and can be adjusted to depool a server or redistribute load.
 
 profile::openstack::base::pdns::labsdb::c1:
+  - c1
+
+profile::openstack::base::pdns::labsdb::c2:
+  - c2
+
+profile::openstack::base::pdns::labsdb::c3:
   - bgwiki
   - bgwiktionary
-  - c1
   - commonswiki
   - cswiki
   - enwiki
@@ -27,11 +32,6 @@
   - thwiki
   - trwiki
   - zhwiki
-
-profile::openstack::base::pdns::labsdb::c2:
-  - c2
-
-profile::openstack::base::pdns::labsdb::c3:
   - aawiki
   - aawikibooks
   - aawiktionary

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3090efa1032a8211996bcc700a0dad731d015046
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
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 "labsdb: Switchover dns for labsdb1001 shards to labs...

2017-10-30 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387291 )

Change subject: Revert "labsdb: Switchover dns for labsdb1001 shards to 
labsdb1003"
..


Revert "labsdb: Switchover dns for labsdb1001 shards to labsdb1003"

This reverts commit 6ca023192edf2124ca5e0018309393843750275e.

Change-Id: I7904a3a5a097410ea17681f470658ab984e5bec3
---
M hieradata/common/profile/openstack/base/pdns/labsdb.yaml
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml 
b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
index 3bfe95b..316aa0a 100644
--- a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
@@ -4,14 +4,9 @@
 #  and can be adjusted to depool a server or redistribute load.
 
 profile::openstack::base::pdns::labsdb::c1:
-  - c1
-
-profile::openstack::base::pdns::labsdb::c2:
-  - c2
-
-profile::openstack::base::pdns::labsdb::c3:
   - bgwiki
   - bgwiktionary
+  - c1
   - commonswiki
   - cswiki
   - enwiki
@@ -32,6 +27,11 @@
   - thwiki
   - trwiki
   - zhwiki
+
+profile::openstack::base::pdns::labsdb::c2:
+  - c2
+
+profile::openstack::base::pdns::labsdb::c3:
   - aawiki
   - aawikibooks
   - aawiktionary

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7904a3a5a097410ea17681f470658ab984e5bec3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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 "labsdb: Switchover dns for labsdb1001 shards to labs...

2017-10-30 Thread Madhuvishy (Code Review) 
Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "labsdb: Switchover dns for labsdb1001 shards to 
labsdb1003"
..

Revert "labsdb: Switchover dns for labsdb1001 shards to labsdb1003"

This reverts commit 6ca023192edf2124ca5e0018309393843750275e.

Change-Id: I7904a3a5a097410ea17681f470658ab984e5bec3
---
M hieradata/common/profile/openstack/base/pdns/labsdb.yaml
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/387291/1

diff --git a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml 
b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
index 3bfe95b..316aa0a 100644
--- a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
@@ -4,14 +4,9 @@
 #  and can be adjusted to depool a server or redistribute load.
 
 profile::openstack::base::pdns::labsdb::c1:
-  - c1
-
-profile::openstack::base::pdns::labsdb::c2:
-  - c2
-
-profile::openstack::base::pdns::labsdb::c3:
   - bgwiki
   - bgwiktionary
+  - c1
   - commonswiki
   - cswiki
   - enwiki
@@ -32,6 +27,11 @@
   - thwiki
   - trwiki
   - zhwiki
+
+profile::openstack::base::pdns::labsdb::c2:
+  - c2
+
+profile::openstack::base::pdns::labsdb::c3:
   - aawiki
   - aawikibooks
   - aawiktionary

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7904a3a5a097410ea17681f470658ab984e5bec3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
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]: labsdb: Switchover dns for labsdb1001 shards to labsdb1003

2017-10-30 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386660 )

Change subject: labsdb: Switchover dns for labsdb1001 shards to labsdb1003
..


labsdb: Switchover dns for labsdb1001 shards to labsdb1003

For the upcoming labsdb1001 reboot planned on Oct 30, switchover
dns for the replica shards currently served from labsdb1001 to
labsdb1003. This patch can be reverted after the reboot is complete.

Bug: T168584
Change-Id: I717941475fc0bf6a954bb097d9c6b4118ea06f28
---
M hieradata/common/profile/openstack/base/pdns/labsdb.yaml
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml 
b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
index 316aa0a..3bfe95b 100644
--- a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
@@ -4,9 +4,14 @@
 #  and can be adjusted to depool a server or redistribute load.
 
 profile::openstack::base::pdns::labsdb::c1:
+  - c1
+
+profile::openstack::base::pdns::labsdb::c2:
+  - c2
+
+profile::openstack::base::pdns::labsdb::c3:
   - bgwiki
   - bgwiktionary
-  - c1
   - commonswiki
   - cswiki
   - enwiki
@@ -27,11 +32,6 @@
   - thwiki
   - trwiki
   - zhwiki
-
-profile::openstack::base::pdns::labsdb::c2:
-  - c2
-
-profile::openstack::base::pdns::labsdb::c3:
   - aawiki
   - aawikibooks
   - aawiktionary

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I717941475fc0bf6a954bb097d9c6b4118ea06f28
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: labsdb: Switchover dns for labsdb1001 shards to labsdb1003

2017-10-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386660 )

Change subject: labsdb: Switchover dns for labsdb1001 shards to labsdb1003
..

labsdb: Switchover dns for labsdb1001 shards to labsdb1003

For the upcoming labsdb1001 reboot planned on Oct 30, switchover
dns for the replica shards currently served from labsdb1001 to
labsdb1003. This patch can be reverted after the reboot is complete.

Bug: T168584
Change-Id: I717941475fc0bf6a954bb097d9c6b4118ea06f28
---
M hieradata/common/profile/openstack/base/pdns/labsdb.yaml
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/386660/1

diff --git a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml 
b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
index 316aa0a..3bfe95b 100644
--- a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
+++ b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
@@ -4,9 +4,14 @@
 #  and can be adjusted to depool a server or redistribute load.
 
 profile::openstack::base::pdns::labsdb::c1:
+  - c1
+
+profile::openstack::base::pdns::labsdb::c2:
+  - c2
+
+profile::openstack::base::pdns::labsdb::c3:
   - bgwiki
   - bgwiktionary
-  - c1
   - commonswiki
   - cswiki
   - enwiki
@@ -27,11 +32,6 @@
   - thwiki
   - trwiki
   - zhwiki
-
-profile::openstack::base::pdns::labsdb::c2:
-  - c2
-
-profile::openstack::base::pdns::labsdb::c3:
   - aawiki
   - aawikibooks
   - aawiktionary

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolforge: Update shinken checks

2017-10-23 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386112 )

Change subject: toolforge: Update shinken checks
..


toolforge: Update shinken checks

* Rebrand from ToolLabs to Toolforge
* Use https for main page check

Change-Id: Ib98b9b741a57598f7165dcbd50ec432c2dc73886
---
M modules/toollabs/files/shinken.cfg
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/modules/toollabs/files/shinken.cfg 
b/modules/toollabs/files/shinken.cfg
index b700160..67e0a83 100644
--- a/modules/toollabs/files/shinken.cfg
+++ b/modules/toollabs/files/shinken.cfg
@@ -1,15 +1,15 @@
 define host{
-host_name   toollabs
-alias   ToolLabs
+host_name   toolforge
+alias   Toolforge
 address tools.wmflabs.org
 contact_groups  tools
 use generic-host
 }
 
 define service {
-service_description ToolLabs Home Page
-host_name   toollabs
-check_command   
check_http_url_at_address_for_string!tools.wmflabs.org!/!Magnus
+service_description Toolforge Home Page
+host_name   toolforge
+check_command   
check_https_url_at_address_for_string!tools.wmflabs.org!/!Magnus
 use generic-service
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib98b9b741a57598f7165dcbd50ec432c2dc73886
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Yuvipanda 
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]: ssh-key-ldap-lookup: Modify script to run additional checks ...

2017-10-16 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384574 )

Change subject: ssh-key-ldap-lookup: Modify script to run additional checks 
before ssh login
..

ssh-key-ldap-lookup: Modify script to run additional checks before ssh login

Bug: T171508
Change-Id: I24d22a168e9f1fa1c30154ec3231200d9f40d624
---
M modules/ldap/files/scripts/ssh-key-ldap-lookup
M modules/ldap/manifests/client/utils.pp
2 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/384574/1

diff --git a/modules/ldap/files/scripts/ssh-key-ldap-lookup 
b/modules/ldap/files/scripts/ssh-key-ldap-lookup
index 239fbdc..13c893d 100755
--- a/modules/ldap/files/scripts/ssh-key-ldap-lookup
+++ b/modules/ldap/files/scripts/ssh-key-ldap-lookup
@@ -23,6 +23,8 @@
 import argparse
 import ldap
 import yaml
+import shlex
+import subrocess
 import sys
 
 
@@ -76,6 +78,21 @@
 return robust_connect(servers, user, password, position)
 
 
+def verify_nfs_mounted():
+# While the initial instance boot process is in progress, all the NFS 
mounts
+# may not be mounted yet. If this is the case, we throw an error
+test_cmd = "/usr/bin/test -e /root/firstboot_done"
+firstboot_in_progress = subprocess.call(shlex.split(test_cmd))
+if firstboot_in_progress:
+mount_command = "/usr/bin/timeout --preserve-status -k 10s 20s 
/bin/mount -a"
+subprocess.check_call(shlex.split(mount_command))
+
+
+def run_auxillary_checks():
+# Run any additional checks before successful user login here
+verify_nfs_mounted()
+
+
 def main():
 parser = argparse.ArgumentParser()
 parser.add_argument('username', help='Username to list ssh keys for')
@@ -112,6 +129,8 @@
 for key in keys:
 # Some keys have an accidental newline at the end, see T77902
 print key.strip()
+run_auxillary_checks()
+
 
 if __name__ == '__main__':
 main()
diff --git a/modules/ldap/manifests/client/utils.pp 
b/modules/ldap/manifests/client/utils.pp
index 09f050f..6c8fc27 100644
--- a/modules/ldap/manifests/client/utils.pp
+++ b/modules/ldap/manifests/client/utils.pp
@@ -45,6 +45,17 @@
 home   => '/nonexistent', # Since things seem to check for 
$HOME/.whatever unconditionally...
 shell  => '/bin/false',
 }
+
+# The ssh-key-ldap-lookup scripts does some additional checks before 
authenticating
+# users via ssh, like ensuring that NFS is mounted. This grants the 
required sudo permissions
+# for these commands
+sudo::user { 'ssh-key-ldap-lookup_sudo':
+user   => 'ssh-key-ldap-lookup',
+privileges => [
+'ALL = NOPASSWD: /usr/bin/timeout --preserve-status -k 10s 20s 
/bin/mount -a',
+],
+require=> User['ssh-key-ldap-lookup'],
+}
 }
 
 file { '/usr/local/lib/python2.7/dist-packages/ldapsupportlib.py':

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Remove uwsgi-python check from grid webservice...

2017-10-02 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381891 )

Change subject: toolschecker: Remove uwsgi-python check from grid webservice 
test
..


toolschecker: Remove uwsgi-python check from grid webservice test

There's no python app in toolschecker-ge-ws which causes this portion
of the test to fail

Bug: T177103
Change-Id: I727291934c6218ae26f03944067ea932a5f8f3ed
---
M modules/toollabs/files/toolschecker.py
1 file changed, 0 insertions(+), 35 deletions(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 448eb0d..a589953 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -453,41 +453,6 @@
 break
 time.sleep(1)
 
-if not success:
-return False
-
-# So far so good -- now, test wsgi
-success = False
-subprocess.check_call([
-'sudo',
-'-u', 'tools.toolschecker-ge-ws',
-'-i',
-'/usr/bin/webservice', 'uwsgi-python', 'start'
-])
-
-for i in range(0, 10):
-request = requests.get(url)
-if request.status_code == 200:
-success = True
-break
-time.sleep(1)
-
-subprocess.check_call([
-'sudo',
-'-u', 'tools.toolschecker-ge-ws',
-'-i',
-'/usr/bin/webservice', 'uwsgi-python', 'stop'
-])
-
-# Make sure it really stopped
-success = success and False
-for i in range(0, 10):
-request = requests.get(url)
-if request.status_code != 200:
-success = True
-break
-time.sleep(1)
-
 return success
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I727291934c6218ae26f03944067ea932a5f8f3ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: toolschecker: Remove uwsgi-python check from grid webservice...

2017-10-02 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381891 )

Change subject: toolschecker: Remove uwsgi-python check from grid webservice 
test
..

toolschecker: Remove uwsgi-python check from grid webservice test

There's no python app in toolschecker-ge-ws which causes this portion
of the test to fail

Bug: T177103
Change-Id: I727291934c6218ae26f03944067ea932a5f8f3ed
---
M modules/toollabs/files/toolschecker.py
1 file changed, 0 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/381891/1

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 448eb0d..a589953 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -453,41 +453,6 @@
 break
 time.sleep(1)
 
-if not success:
-return False
-
-# So far so good -- now, test wsgi
-success = False
-subprocess.check_call([
-'sudo',
-'-u', 'tools.toolschecker-ge-ws',
-'-i',
-'/usr/bin/webservice', 'uwsgi-python', 'start'
-])
-
-for i in range(0, 10):
-request = requests.get(url)
-if request.status_code == 200:
-success = True
-break
-time.sleep(1)
-
-subprocess.check_call([
-'sudo',
-'-u', 'tools.toolschecker-ge-ws',
-'-i',
-'/usr/bin/webservice', 'uwsgi-python', 'stop'
-])
-
-# Make sure it really stopped
-success = success and False
-for i in range(0, 10):
-request = requests.get(url)
-if request.status_code != 200:
-success = True
-break
-time.sleep(1)
-
 return success
 
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Fix sudo options typo in more places

2017-10-02 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381889 )

Change subject: toolschecker: Fix sudo options typo in more places
..


toolschecker: Fix sudo options typo in more places

Bug: T177103
Change-Id: Ibe05102d131084e179af059d05de76c8736b1683
---
M modules/toollabs/files/toolschecker.py
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 6de8ace..448eb0d 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -439,7 +439,7 @@
 
 subprocess.check_call([
 'sudo',
-'u', 'tools.toolschecker-ge-ws',
+'-u', 'tools.toolschecker-ge-ws',
 '-i',
 '/usr/bin/webservice', 'stop'
 ])
@@ -460,7 +460,7 @@
 success = False
 subprocess.check_call([
 'sudo',
-'u', 'tools.toolschecker-ge-ws',
+'-u', 'tools.toolschecker-ge-ws',
 '-i',
 '/usr/bin/webservice', 'uwsgi-python', 'start'
 ])
@@ -474,7 +474,7 @@
 
 subprocess.check_call([
 'sudo',
-'u', 'tools.toolschecker-ge-ws',
+'-u', 'tools.toolschecker-ge-ws',
 '-i',
 '/usr/bin/webservice', 'uwsgi-python', 'stop'
 ])

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe05102d131084e179af059d05de76c8736b1683
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: toolschecker: Fix sudo options typo in more places

2017-10-02 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381889 )

Change subject: toolschecker: Fix sudo options typo in more places
..

toolschecker: Fix sudo options typo in more places

Bug: T177103
Change-Id: Ibe05102d131084e179af059d05de76c8736b1683
---
M modules/toollabs/files/toolschecker.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/381889/1

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 6de8ace..448eb0d 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -439,7 +439,7 @@
 
 subprocess.check_call([
 'sudo',
-'u', 'tools.toolschecker-ge-ws',
+'-u', 'tools.toolschecker-ge-ws',
 '-i',
 '/usr/bin/webservice', 'stop'
 ])
@@ -460,7 +460,7 @@
 success = False
 subprocess.check_call([
 'sudo',
-'u', 'tools.toolschecker-ge-ws',
+'-u', 'tools.toolschecker-ge-ws',
 '-i',
 '/usr/bin/webservice', 'uwsgi-python', 'start'
 ])
@@ -474,7 +474,7 @@
 
 subprocess.check_call([
 'sudo',
-'u', 'tools.toolschecker-ge-ws',
+'-u', 'tools.toolschecker-ge-ws',
 '-i',
 '/usr/bin/webservice', 'uwsgi-python', 'stop'
 ])

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Fix sudo options in webservice start command

2017-10-02 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381887 )

Change subject: toolschecker: Fix sudo options in webservice start command
..


toolschecker: Fix sudo options in webservice start command

Bug: T177103
Change-Id: I41c1a451e1c8f779250131b4563cb7b65999b1ce
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index a002871..6de8ace 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -425,7 +425,7 @@
 url = "https://tools.wmflabs.org/toolschecker-ge-ws/;
 subprocess.check_call([
 'sudo',
-'u', 'tools.toolschecker-ge-ws',
+'-u', 'tools.toolschecker-ge-ws',
 '-i',
 '/usr/bin/webservice', 'start'
 ])

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41c1a451e1c8f779250131b4563cb7b65999b1ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: toolschecker: Fix sudo options in webservice start command

2017-10-02 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381887 )

Change subject: toolschecker: Fix sudo options in webservice start command
..

toolschecker: Fix sudo options in webservice start command

Bug: T177103
Change-Id: I41c1a451e1c8f779250131b4563cb7b65999b1ce
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/381887/1

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index a002871..6de8ace 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -425,7 +425,7 @@
 url = "https://tools.wmflabs.org/toolschecker-ge-ws/;
 subprocess.check_call([
 'sudo',
-'u', 'tools.toolschecker-ge-ws',
+'-u', 'tools.toolschecker-ge-ws',
 '-i',
 '/usr/bin/webservice', 'start'
 ])

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolschecker: Fix labsdb1005 test to use a current DB

2017-10-02 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381885 )

Change subject: toolschecker: Fix labsdb1005 test to use a current DB
..


toolschecker: Fix labsdb1005 test to use a current DB

Bug: T177103
Change-Id: I1711dc7136531f2d9bfbca0577df2a7d3f1be544
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 77e0004..a002871 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -156,7 +156,7 @@
 read_default_file=os.path.expanduser('~/replica.my.cnf')
 )
 cur = connection.cursor()
-cur.execute('select * from toolserverdb_p.wiki limit 1')
+cur.execute('select * from toollabs_p.tools limit 1')
 result = cur.fetchone()
 if result:
 return True

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1711dc7136531f2d9bfbca0577df2a7d3f1be544
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: Yuvipanda 
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]: toolschecker: Fix labsdb1005 test to use a current DB

2017-10-02 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381885 )

Change subject: toolschecker: Fix labsdb1005 test to use a current DB
..

toolschecker: Fix labsdb1005 test to use a current DB

Bug: T177103
Change-Id: I1711dc7136531f2d9bfbca0577df2a7d3f1be544
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/381885/1

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 77e0004..a002871 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -156,7 +156,7 @@
 read_default_file=os.path.expanduser('~/replica.my.cnf')
 )
 cur = connection.cursor()
-cur.execute('select * from toolserverdb_p.wiki limit 1')
+cur.execute('select * from toollabs_p.tools limit 1')
 result = cur.fetchone()
 if result:
 return True

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: device_backup: Update cron MAILTo to new mailing list address

2017-09-27 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378989 )

Change subject: device_backup: Update cron MAILTo to new mailing list address
..


device_backup: Update cron MAILTo to new mailing list address

Bug: T168480
Change-Id: I087b1a0f321e72c632b8be9113b42f8310b45042
---
M modules/labstore/manifests/device_backup.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/labstore/manifests/device_backup.pp 
b/modules/labstore/manifests/device_backup.pp
index c02aa90..b915cfa 100644
--- a/modules/labstore/manifests/device_backup.pp
+++ b/modules/labstore/manifests/device_backup.pp
@@ -33,7 +33,7 @@
 weekday => $day[$weekday],
 hour=> $hour,
 minute  => $minute,
-environment => 'MAILTO=labs-ad...@lists.wikimedia.org',
+environment => 'MAILTO=cloud-ad...@lists.wikimedia.org',
 require => File['/usr/local/sbin/snapshot-manager'],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I087b1a0f321e72c632b8be9113b42f8310b45042
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: toolforge: Remove /usr/bin/sql

2017-09-27 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380685 )

Change subject: toolforge: Remove /usr/bin/sql
..


toolforge: Remove /usr/bin/sql

The misctools debian package created from labs/toollabs.git contains
a rewrite of /usr/bin/sql to python3 that was added by Tim Landsheidt in
695c7fb, but we have not stopped overwriting it with the older bash
version.

Bug: T176688
Change-Id: I91cdc62ff27546351f593a83f090aa2dede0d736
---
D modules/toollabs/files/sql
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 0 insertions(+), 128 deletions(-)

Approvals:
  Madhuvishy: Looks good to me, approved
  Merlijn van Deen: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/toollabs/files/sql b/modules/toollabs/files/sql
deleted file mode 100755
index 65f5314..000
--- a/modules/toollabs/files/sql
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-
-# this tool allow you to connect quickly to sql database
-# it should work for all newbies
-
-verbose=0
-
-function Log {
-if [ $verbose -eq 1 ];then
-   echo "$1"
-fi
-}
-
-if [ $# -lt 1 ];then
-echo "Usage: \"sql  [-vh]\" type sql --help for 
more help"
-exit 0
-fi
-
-if [ "$1" = "-h" ] || [ "$1" == "--help" ];then
-echo "Usage: sql [_p] [-vh] [command(s)]"
-   echo
-   echo "This tool allows you to easily open a connection to sql database 
without having to provide the credentials or a database host server"
-   echo "Example: sql frwiki_p"
-   echo
-   echo "Parameters:"
-   echo "  -v: verbose - produce various information about the resolution 
of db"
-   echo
-   echo "Report bugs to phabricator: https://phabricator.wikimedia.org;
-   exit 0
-fi
-
-for i
-do
-   if [ "$i" = "-v" ] || [ "$i" = "--verbose" ]
-   then
-   verbose=1
-   fi
-done
-
-if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ]
-then
-   Log "WARNING: There is no configuration file for mysql to use, you will 
probably be unable to access the database"
-fi
-
-param=""
-# check if the user has a replica file
-if [ -f ~/replica.my.cnf ];then
-param=" --defaults-file=~/replica.my.cnf"
-else
-if [ ! -f ~/.my.cnf ];then
-param=" -p"
-fi
-fi
-
-server="enwiki.labsdb"
-db="enwiki_p"
-
-case "$1" in
-"en" | "enwiki" | "enwiki_p")
-server="enwiki.labsdb"
-db="enwiki_p"
-;;
-"de" | "dewiki" | "dewiki_p")
-server="dewiki.labsdb"
-db="dewiki_p"
-;;
-"fr" | "frwiki" | "frwiki_p")
-server="frwiki.labsdb"
-db="frwiki_p"
-;;
-"cs" | "cswiki" | "cswiki_p")
-server="cswiki.labsdb"
-db="cswiki_p"
-;;
-"commons" | "commonswiki" | "commonswiki_p")
-server="commonswiki.labsdb"
-db="commonswiki_p"
-;;
-"wikidata" | "wikidatawiki" | "wikidatawiki_p")
-server="wikidatawiki.labsdb"
-db="wikidatawiki_p"
-;;
-"meta" | "meta_p")
-# Not to confuse with metawiki[_p]
-# 
https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Metadata_database
-server="s7.labsdb"
-db="meta_p"
-;;
-"local")
-server=tools-db
-db=""
-if [ -f ~/.my.cnf ];then
-   param=""
-fi
-   ;;
-   *)
-   # we don't know what the database is so we check if it exist first
-   Log "This database name is not known by sql script, fallback to dblist 
resolution"
-   db="${1%_p}_p"
-   server="${db%_p}.labsdb"
-   if getent hosts -- "$server" > /dev/null
-   then
-   Log "Resolved to $server $db"
-   else
-   echo "Could not find requested database"
-if [ "$db" != "$1" ]; then
-echo 'Make sure to ask for a db in format of _p'
-fi
-   exit 1
-   fi
-   ;;
-esac
-
-shift
-Log "Connecting to $server"
-if [ $# -lt 1 ]; then
-  exec mysql $param -h $server $db "$@"
-else
-  echo "$@" | mysql $param -h $server $db
-fi
diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index f33c47a..53c73cb 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -401,14 +401,6 @@
 ensure => latest,
 }
 
-file { '/usr/bin/sql':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-source => 'puppet:///modules/toollabs/sql',
-}
-
 sysctl::parameters { 'tool labs':
 values => {
 'vm.overcommit_memory' => 2,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91cdc62ff27546351f593a83f090aa2dede0d736
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production

[MediaWiki-commits] [Gerrit] operations/puppet[production]: paws_internal: Add the analytics client role back to noteboo...

2017-09-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380914 )

Change subject: paws_internal: Add the analytics client role back to 
notebook1001
..


paws_internal: Add the analytics client role back to notebook1001

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 9085ec4..b44e5b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1875,8 +1875,7 @@
 
 # Experimental Jupyter notebook servers
 node 'notebook1001.eqiad.wmnet' {
-role(paws_internal::jupyterhub, paws_internal::mysql_access)
-
+role(paws_internal::jupyterhub, analytics_cluster::client, 
paws_internal::mysql_access)
 include ::standard
 }
 node 'notebook1002.eqiad.wmnet' {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78dfc5847c9ad89044f144a7621c7f6d7cd20364
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: paws_internal: Add the analytics client role back to noteboo...

2017-09-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380914 )

Change subject: paws_internal: Add the analytics client role back to 
notebook1001
..

paws_internal: Add the analytics client role back to notebook1001

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/380914/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 9085ec4..b44e5b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1875,8 +1875,7 @@
 
 # Experimental Jupyter notebook servers
 node 'notebook1001.eqiad.wmnet' {
-role(paws_internal::jupyterhub, paws_internal::mysql_access)
-
+role(paws_internal::jupyterhub, analytics_cluster::client, 
paws_internal::mysql_access)
 include ::standard
 }
 node 'notebook1002.eqiad.wmnet' {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: public_dumps: Set up initial module and profile, add to role

2017-09-22 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379810 )

Change subject: public_dumps: Set up initial module and profile, add to role
..


public_dumps: Set up initial module and profile, add to role

Bug: T171539
Change-Id: I36b447d60987ec0789955edd5c47c82b9e39e469
---
A modules/profile/manifests/dumps/public_server.pp
A modules/public_dumps/manifests/server.pp
M modules/role/manifests/dumps/public/server.pp
3 files changed, 29 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
new file mode 100644
index 000..25defd1
--- /dev/null
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -0,0 +1,9 @@
+# Profile for Dumps server in the Public VLAN,
+# that serves dumps to Cloud VPS/Stat boxes via NFS,
+# or via web or rsync to mirrors
+
+class profile::dumps::public_server {
+
+class {'::public_dumps::server':}
+
+}
diff --git a/modules/public_dumps/manifests/server.pp 
b/modules/public_dumps/manifests/server.pp
new file mode 100644
index 000..0bd796f
--- /dev/null
+++ b/modules/public_dumps/manifests/server.pp
@@ -0,0 +1,17 @@
+# Base class to set up a Public Dumps server
+class public_dumps::server {
+
+file { '/srv/dumps':
+ensure => 'directory',
+}
+
+mount { '/srv/dumps':
+ensure  => mounted,
+fstype  => ext4,
+options => 'defaults,noatime',
+atboot  => true,
+device  => '/dev/data/dumps',
+require => File['/srv/dumps'],
+}
+
+}
diff --git a/modules/role/manifests/dumps/public/server.pp 
b/modules/role/manifests/dumps/public/server.pp
index d4dcea0..9f15bb6 100644
--- a/modules/role/manifests/dumps/public/server.pp
+++ b/modules/role/manifests/dumps/public/server.pp
@@ -1,5 +1,7 @@
 class role::dumps::public::server {
-system::role { 'dumps::public::server': description => 'Dumps host in 
public VLAN that serves dumps to clients via NFS/Web/Rsync' }
+system::role { 'dumps::public::server': description => 'labstore host in 
the public VLAN that serves Dumps to clients via NFS/Web/Rsync' }
 
 include ::standard
+
+include ::profile::dumps::public_server
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36b447d60987ec0789955edd5c47c82b9e39e469
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
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]: public_dumps: Set up initial module and profile, add to role

2017-09-22 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379810 )

Change subject: public_dumps: Set up initial module and profile, add to role
..

public_dumps: Set up initial module and profile, add to role

Bug: T171539
Change-Id: I36b447d60987ec0789955edd5c47c82b9e39e469
---
A modules/profile/manifests/dumps/public_server.pp
A modules/public_dumps/manifests/server.pp
M modules/role/manifests/dumps/public/server.pp
3 files changed, 29 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/379810/1

diff --git a/modules/profile/manifests/dumps/public_server.pp 
b/modules/profile/manifests/dumps/public_server.pp
new file mode 100644
index 000..25defd1
--- /dev/null
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -0,0 +1,9 @@
+# Profile for Dumps server in the Public VLAN,
+# that serves dumps to Cloud VPS/Stat boxes via NFS,
+# or via web or rsync to mirrors
+
+class profile::dumps::public_server {
+
+class {'::public_dumps::server':}
+
+}
diff --git a/modules/public_dumps/manifests/server.pp 
b/modules/public_dumps/manifests/server.pp
new file mode 100644
index 000..0bd796f
--- /dev/null
+++ b/modules/public_dumps/manifests/server.pp
@@ -0,0 +1,17 @@
+# Base class to set up a Public Dumps server
+class public_dumps::server {
+
+file { '/srv/dumps':
+ensure => 'directory',
+}
+
+mount { '/srv/dumps':
+ensure  => mounted,
+fstype  => ext4,
+options => 'defaults,noatime',
+atboot  => true,
+device  => '/dev/data/dumps',
+require => File['/srv/dumps'],
+}
+
+}
diff --git a/modules/role/manifests/dumps/public/server.pp 
b/modules/role/manifests/dumps/public/server.pp
index d4dcea0..9f15bb6 100644
--- a/modules/role/manifests/dumps/public/server.pp
+++ b/modules/role/manifests/dumps/public/server.pp
@@ -1,5 +1,7 @@
 class role::dumps::public::server {
-system::role { 'dumps::public::server': description => 'Dumps host in 
public VLAN that serves dumps to clients via NFS/Web/Rsync' }
+system::role { 'dumps::public::server': description => 'labstore host in 
the public VLAN that serves Dumps to clients via NFS/Web/Rsync' }
 
 include ::standard
+
+include ::profile::dumps::public_server
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: public_dumps: Create initial role for public dumps servers

2017-09-22 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379802 )

Change subject: public_dumps: Create initial role for public dumps servers
..


public_dumps: Create initial role for public dumps servers

Change-Id: I52ff5498626b8a39f4580bd9c52d7dcf3e77dd20
---
M manifests/site.pp
A modules/role/manifests/dumps/public/server.pp
2 files changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 45fd5f5..1939166 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1369,9 +1369,8 @@
 include ::standard
 }
 
-# new labstore nodes, set to spare until pushed into service T167984
 node /labstore100[67]\.wikimedia\.org/ {
-role(spare::system)
+role(dumps::public::server)
 }
 
 node /labstore200[1-2]\.codfw\.wmnet/ {
diff --git a/modules/role/manifests/dumps/public/server.pp 
b/modules/role/manifests/dumps/public/server.pp
new file mode 100644
index 000..d4dcea0
--- /dev/null
+++ b/modules/role/manifests/dumps/public/server.pp
@@ -0,0 +1,5 @@
+class role::dumps::public::server {
+system::role { 'dumps::public::server': description => 'Dumps host in 
public VLAN that serves dumps to clients via NFS/Web/Rsync' }
+
+include ::standard
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52ff5498626b8a39f4580bd9c52d7dcf3e77dd20
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
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]: public_dumps: Create initial role for public dumps servers

2017-09-22 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379802 )

Change subject: public_dumps: Create initial role for public dumps servers
..

public_dumps: Create initial role for public dumps servers

Change-Id: I52ff5498626b8a39f4580bd9c52d7dcf3e77dd20
---
M manifests/site.pp
A modules/role/manifests/dumps/public/server.pp
2 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/379802/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 45fd5f5..1939166 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1369,9 +1369,8 @@
 include ::standard
 }
 
-# new labstore nodes, set to spare until pushed into service T167984
 node /labstore100[67]\.wikimedia\.org/ {
-role(spare::system)
+role(dumps::public::server)
 }
 
 node /labstore200[1-2]\.codfw\.wmnet/ {
diff --git a/modules/role/manifests/dumps/public/server.pp 
b/modules/role/manifests/dumps/public/server.pp
new file mode 100644
index 000..d4dcea0
--- /dev/null
+++ b/modules/role/manifests/dumps/public/server.pp
@@ -0,0 +1,5 @@
+class role::dumps::public::server {
+system::role { 'dumps::public::server': description => 'Dumps host in 
public VLAN that serves dumps to clients via NFS/Web/Rsync' }
+
+include ::standard
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: device_backup: Update cron MAILTo to new mailing list address

2017-09-19 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378989 )

Change subject: device_backup: Update cron MAILTo to new mailing list address
..

device_backup: Update cron MAILTo to new mailing list address

Bug: T168480
Change-Id: I087b1a0f321e72c632b8be9113b42f8310b45042
---
M modules/labstore/manifests/device_backup.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/378989/1

diff --git a/modules/labstore/manifests/device_backup.pp 
b/modules/labstore/manifests/device_backup.pp
index c02aa90..b915cfa 100644
--- a/modules/labstore/manifests/device_backup.pp
+++ b/modules/labstore/manifests/device_backup.pp
@@ -33,7 +33,7 @@
 weekday => $day[$weekday],
 hour=> $hour,
 minute  => $minute,
-environment => 'MAILTO=labs-ad...@lists.wikimedia.org',
+environment => 'MAILTO=cloud-ad...@lists.wikimedia.org',
 require => File['/usr/local/sbin/snapshot-manager'],
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: notebook: Add packages to enable PDF exports

2017-09-18 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378776 )

Change subject: notebook: Add packages to enable PDF exports
..


notebook: Add packages to enable PDF exports

Bug: T159617
Change-Id: I5296e9bf6fd0c8b996a684865d22148a73e3609b
---
M modules/jupyterhub/manifests/init.pp
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/modules/jupyterhub/manifests/init.pp 
b/modules/jupyterhub/manifests/init.pp
index e90ff6c..d077dcc 100644
--- a/modules/jupyterhub/manifests/init.pp
+++ b/modules/jupyterhub/manifests/init.pp
@@ -44,6 +44,19 @@
 
 require_package('nginx-extras')
 
+# Packages for PDF exports
+if ! defined(Package['pandoc']){
+package { 'pandoc':
+ensure => present,
+}
+}
+
+ensure_packages([
+'texlive-xetex',
+'texlive-fonts-recommended',
+'texlive-generic-recommended',
+])
+
 file { $base_path:
 ensure => directory,
 owner  => 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5296e9bf6fd0c8b996a684865d22148a73e3609b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: notebook: Add packages to enable PDF exports

2017-09-18 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378776 )

Change subject: notebook: Add packages to enable PDF exports
..

notebook: Add packages to enable PDF exports

Bug: T159617
Change-Id: I5296e9bf6fd0c8b996a684865d22148a73e3609b
---
M modules/jupyterhub/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/378776/1

diff --git a/modules/jupyterhub/manifests/init.pp 
b/modules/jupyterhub/manifests/init.pp
index e90ff6c..49f822a 100644
--- a/modules/jupyterhub/manifests/init.pp
+++ b/modules/jupyterhub/manifests/init.pp
@@ -42,6 +42,14 @@
 'pwgen',
 ])
 
+# Packages for PDF exports
+ensure_packages([
+'pandoc',
+'texlive-xetex',
+'texlive-fonts-recommended',
+'texlive-generic-recommended',
+])
+
 require_package('nginx-extras')
 
 file { $base_path:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: firstboot: Fix force puppet run after ensure NFS mounts avai...

2017-09-17 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378653 )

Change subject: firstboot: Fix force puppet run after ensure NFS mounts 
available
..


firstboot: Fix force puppet run after ensure NFS mounts available

Successful puppet runs don't exit with code 0 so my previous
`&& puppet agent -tv && break` logic doesn't work. Changing to
just run puppet outside the until block

Bug: T171508
Change-Id: Ie2f88d5c315aa73f09c9ba1cfd91c8be2dd6527e
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index c6585ad..a7991e9 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -198,10 +198,15 @@
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
 ((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet 
agent -t && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
 # Sleep for 10s before next attempt
 sleep 10
 done
 
+# Run puppet again post mounting NFS mounts (if all the mounts hadn't been 
mounted
+# before, the puppet code that ensures the symlinks are created, etc may not
+# have run)
+puppet agent -t
+
 # Remove the non-root login restriction
 rm /etc/nologin
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index 8ba4619..3bfa32f 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -131,10 +131,15 @@
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
 ((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet 
agent -t && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
 # Sleep for 10s before next attempt
 sleep 10
 done
 
+# Run puppet again post mounting NFS mounts (if all the mounts hadn't been 
mounted
+# before, the puppet code that ensures the symlinks are created, etc may not
+# have run)
+puppet agent -t
+
 # Remove the non-root login restriction
 rm /etc/nologin

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2f88d5c315aa73f09c9ba1cfd91c8be2dd6527e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: firstboot: Fix force puppet run after ensure NFS mounts avai...

2017-09-17 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378653 )

Change subject: firstboot: Fix force puppet run after ensure NFS mounts 
available
..

firstboot: Fix force puppet run after ensure NFS mounts available

Successful puppet runs don't exit with code 0 so my previous
`&& puppet agent -tv && break` logic doesn't work. Changing to
just run puppet outside the while block

Bug: T171508
Change-Id: Ie2f88d5c315aa73f09c9ba1cfd91c8be2dd6527e
---
M modules/labs_bootstrapvz/files/firstboot.sh
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/378653/1

diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index c6585ad..a7991e9 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -198,10 +198,15 @@
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
 ((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet 
agent -t && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
 # Sleep for 10s before next attempt
 sleep 10
 done
 
+# Run puppet again post mounting NFS mounts (if all the mounts hadn't been 
mounted
+# before, the puppet code that ensures the symlinks are created, etc may not
+# have run)
+puppet agent -t
+
 # Remove the non-root login restriction
 rm /etc/nologin

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: firstboot: Force puppet run after ensure NFS mounts available

2017-09-17 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378639 )

Change subject: firstboot: Force puppet run after ensure NFS mounts available
..


firstboot: Force puppet run after ensure NFS mounts available

Bug: T171508
Change-Id: I98914cfb79ede672649c3d2cc7b692a87ccc7d52
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index 0388041..c6585ad 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -198,7 +198,7 @@
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
 ((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet 
agent -t && break
 # Sleep for 10s before next attempt
 sleep 10
 done
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index dcd1784..8ba4619 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -131,7 +131,7 @@
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
 ((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet 
agent -t && break
 # Sleep for 10s before next attempt
 sleep 10
 done

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98914cfb79ede672649c3d2cc7b692a87ccc7d52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: firstboot: Force puppet run after ensure NFS mounts available

2017-09-17 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378639 )

Change subject: firstboot: Force puppet run after ensure NFS mounts available
..

firstboot: Force puppet run after ensure NFS mounts available

Bug: T171508
Change-Id: I98914cfb79ede672649c3d2cc7b692a87ccc7d52
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index 0388041..c6585ad 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -198,7 +198,7 @@
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
 ((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet 
agent -t && break
 # Sleep for 10s before next attempt
 sleep 10
 done
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index dcd1784..8ba4619 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -131,7 +131,7 @@
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
 echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
 ((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet 
agent -t && break
 # Sleep for 10s before next attempt
 sleep 10
 done

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs: Add shinken check for tools-mail exim queue length

2017-09-14 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378105 )

Change subject: toollabs: Add shinken check for tools-mail exim queue length
..

toollabs: Add shinken check for tools-mail exim queue length

Bug: T96898
Change-Id: Id119f46593308cb28dccdae29fb13ce8635518dc
---
M modules/nagios_common/files/contactgroups-labs.cfg
M modules/toollabs/files/shinken.cfg
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/378105/1

diff --git a/modules/nagios_common/files/contactgroups-labs.cfg 
b/modules/nagios_common/files/contactgroups-labs.cfg
index 76f0f5f..030a800 100644
--- a/modules/nagios_common/files/contactgroups-labs.cfg
+++ b/modules/nagios_common/files/contactgroups-labs.cfg
@@ -1,5 +1,5 @@
 # This file is managed by puppet
-# Add contact 'guest' to all groups so webUI will show the guest accout
+# Add contact 'guest' to all groups so webUI will show the guest account
 # status for services
 define contactgroup {
 contactgroup_name   tools
diff --git a/modules/toollabs/files/shinken.cfg 
b/modules/toollabs/files/shinken.cfg
index 1b64b54..a632f0e 100644
--- a/modules/toollabs/files/shinken.cfg
+++ b/modules/toollabs/files/shinken.cfg
@@ -19,4 +19,12 @@
 hostgroup_name tools
 service_descriptionHigh iowait
 usegeneric-service
-}
\ No newline at end of file
+}
+
+# Check that the exim queue length is not more than 100 (warn) / 200 (crit) 
over the last 10 minutes
+define service {
+service_description exim queue length
+host_name   tools-mail
+check_command   
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.exim.queue.length!100!200!10min!0min!1!--over
+use generic-service
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add centralnotice tables to maintain-views.yaml

2017-08-31 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374875 )

Change subject: Add centralnotice tables to maintain-views.yaml
..


Add centralnotice tables to maintain-views.yaml

Bug: T135405
Change-Id: I59e2b0c08be5b87e8cb62d5432eda5e51e97e644
---
M modules/role/templates/labs/db/views/maintain-views.yaml
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/templates/labs/db/views/maintain-views.yaml 
b/modules/role/templates/labs/db/views/maintain-views.yaml
index 4059e04..8d8b8ab 100644
--- a/modules/role/templates/labs/db/views/maintain-views.yaml
+++ b/modules/role/templates/labs/db/views/maintain-views.yaml
@@ -36,6 +36,21 @@
   - category
   - categorylinks
   - change_tag
+  - cn_assignments
+  - cn_known_devices
+  - cn_known_mobile_carriers
+  - cn_notice_countries
+  - cn_notice_languages
+  - cn_notice_log
+  - cn_notice_mixin_params
+  - cn_notice_mixins
+  - cn_notice_mobile_carriers
+  - cn_notice_projects
+  - cn_notices
+  - cn_template_devices
+  - cn_template_log
+  - cn_template_mixins
+  - cn_templates
   - ep_articles
   - ep_cas
   - ep_events

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59e2b0c08be5b87e8cb62d5432eda5e51e97e644
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
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 me back to deployment-prep shinken contacts

2017-08-31 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374866 )

Change subject: Add me back to deployment-prep shinken contacts
..


Add me back to deployment-prep shinken contacts

Change-Id: I13a492e4fd2423e9dc49b8bdab4b9b352948f527
---
M modules/nagios_common/files/contactgroups-labs.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/nagios_common/files/contactgroups-labs.cfg 
b/modules/nagios_common/files/contactgroups-labs.cfg
index 2165ca9..76f0f5f 100644
--- a/modules/nagios_common/files/contactgroups-labs.cfg
+++ b/modules/nagios_common/files/contactgroups-labs.cfg
@@ -16,7 +16,7 @@
 define contactgroup {
 contactgroup_name   deployment-prep
 alias   Beta Cluster Administrators
-members 
guest,greg_g,twentyafterfour,betacluster-alerts-list,irc-releng,kart_,gehel
+members 
guest,greg_g,twentyafterfour,betacluster-alerts-list,irc-releng,kart_,gehel,krenair
 }
 
 define contactgroup {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13a492e4fd2423e9dc49b8bdab4b9b352948f527
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Madhuvishy 
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]: new *.wmflabs.org certificate for cert expiry on 2017-10-16

2017-08-31 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374873 )

Change subject: new *.wmflabs.org certificate for cert expiry on 2017-10-16
..


new *.wmflabs.org certificate for cert expiry on 2017-10-16

READ BEFORE MERGE!
Do not merge this without fully understanding the ramifications.  At the
time this is merged, the private repo will need update, as the
new.star.wmflabs.org.key file contents will need to be moved into the
star.wmflabs.org.key file.  All servers/services using this
certificate/key pair will be affected by this change.

It is recommended this patchset be pushed live by the cloud team.

The existing certificate expires on 2017-10-16.  This new certificate is
valid from 2017-08-30 onwards.  (GS renewals add on the existing certs
time to the year cert purchase.)

Bug: T174053
Change-Id: I5679e31348804240f8f1e36a7780e997e5b8dce4
---
M files/ssl/star.wmflabs.org.crt
1 file changed, 16 insertions(+), 16 deletions(-)

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



diff --git a/files/ssl/star.wmflabs.org.crt b/files/ssl/star.wmflabs.org.crt
index 288caa6..05affe6 100644
--- a/files/ssl/star.wmflabs.org.crt
+++ b/files/ssl/star.wmflabs.org.crt
@@ -1,17 +1,17 @@
 -BEGIN CERTIFICATE-
-MIIFUDCCBDigAwIBAgIMJ/Pc1rZTn2X665otMA0GCSqGSIb3DQEBCwUAMGYxCzAJ
+MIIFUDCCBDigAwIBAgIMMCrAgF7FksZSIBUJMA0GCSqGSIb3DQEBCwUAMGYxCzAJ
 BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNH
 bG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g
-RzIwHhcNMTYwOTA4MTkzMTA0WhcNMTcxMDE2MTU0MTA1WjB3MQswCQYDVQQGEwJV
+RzIwHhcNMTcwODMwMTkyMTAxWhcNMTgxMTE2MTU0MTA1WjB3MQswCQYDVQQGEwJV
 UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEj
 MCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xFjAUBgNVBAMMDSou
-d21mbGFicy5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvj5dK
-pmbYx3MxtByzkQz/5FtBh1GiZrFePnGy0X77sse3yle0ls7pIbdZJq9uwz1lnG7x
-kI3c1W7ddbsW+bfTQr8qeOwK95Yef8ltvZzU2sMX8JiYZ1iq0DZbeSTNUG/dxMex
-3vDLhz6mqepLI0wFplkwsmgJkbyp/n+MYzqIaVqthMkNSh1Mxnxc+96N9lQ6BHZF
-DKQnPewhjWF4uQHxOpnoBwYpvivbsMKvr07Zj3VgbewPOIN2bTCPvGdtx2BKtuf0
-vFRWUl/X9IEMS+elBv3zkuj5/+202dCCntu1BQCKVmDmgtN33kn1vtgwrEPvNIM6
-V16B+iRfpzaci1wvAgMBAAGjggHrMIIB5zAOBgNVHQ8BAf8EBAMCBaAwgaAGCCsG
+d21mbGFicy5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0mlIp
+5zxZUC8QZHeKCFvHHEeWxDHsZMzwYxqTPCWB0qezR8EGl51T25moYJHiJmmZilW6
+ajVnsPhFDUdNcRuMcWdiswe/wOiql+OHqcbRJlWXC6KWS96VLq51yA7qbwl/m8JS
+oDDu10EYOHVTn/zjpbDYry9a7Hp5zrqiB2YPzCtrJNSWk9xZa0N0LD5WudGf8/dB
+GaiJGKTWl89+qIETKQVzRJmqmYapMuZ/DxHAfJm6k9U2goj5hl103zEhUyWKgix7
+kgQO1mkALToK41RMLDr+VO/sH6glLUE1o7kjObfgNntw27V0j9vvWCJzP8lTROfC
+rZUO5Bevr2gdZ805AgMBAAGjggHrMIIB5zAOBgNVHQ8BAf8EBAMCBaAwgaAGCCsG
 AQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2JhbHNp
 Z24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/Bggr
 BgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0
@@ -20,12 +20,12 @@
 DAECAjAJBgNVHRMEAjAAMEkGA1UdHwRCMEAwPqA8oDqGOGh0dHA6Ly9jcmwuZ2xv
 YmFsc2lnbi5jb20vZ3MvZ3Nvcmdhbml6YXRpb252YWxzaGEyZzIuY3JsMCUGA1Ud
 EQQeMByCDSoud21mbGFicy5vcmeCC3dtZmxhYnMub3JnMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUIsMdpXtzD7Ap/BiCnIaxO4gYFLcw
+AQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUg91hHPFB3K0l3T0JBTrG1zBLZt0w
 HwYDVR0jBBgwFoAUlt5h8b0cFilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQELBQAD
-ggEBAI/7wEVnp5m6KVMX6Ric+oTp2vKj4Dvun9yUheTDdtMO9vZN0nVwuvgCc8wE
-QLY5YQKL0iagL59KQSmQMYB0i6H5W00ZJd8o5dETGgCk4Jug2yC5fjqoG5zFqAss
-dKVI+SRxbR1gQ94MDbaNzox/k+bhqxB0ca6vKX0nlVExMr6WfQsODu8SWSDavclo
-j6VyJYb3Oig9G3fZdMCVMOt7jnH9PytiC3edMfvaMIf/tl7m58BhhG9vL8Sr+7oB
-A5DJg7NcR/Gq7t178gtGbTnHphBFOohvSZNvPQxS4Q6fSgon7J9RarkW7nYdPqQ6
-WS2V0yuO4jAO2l9sEiy7DiOoIEA=
+ggEBABcho7EUEhV/Fo/4bp/WGLFBkf4vp9NP0TRufJrZJk0gSBHW0oA80/nUz4ND
+1+du3X9BWsQkI1GmQ8/KMJMkxmKOdA9DkEiqzaeMSegfG2PsjXflFJuW9BleAAU5
+T4KV+1hL1e3QB7IPeDNomJ+5TJdxq6kV/rOGuQXKC6M+NmqWj7xYtzLtdXrmX6ZL
+WIejHNgldCDeMPwQBTXfrqfg6dUTpOgN3VQapbKgBO+NO4SehMmCnQeuo7sEMUac
+9tdKwT31HLdESmuYd56ZMxHYwY4o5hFvGOABVvSv5FmaHgEjMYdiVjy+zCyzKY9D
+Jdb6WhSWD3eZ144uHMBIywk0z1c=
 -END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5679e31348804240f8f1e36a7780e997e5b8dce4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Madhuvishy 
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]: nfsmount: Add temporary exception to the block-for-export check

2017-08-30 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374845 )

Change subject: nfsmount: Add temporary exception to the block-for-export check
..


nfsmount: Add temporary exception to the block-for-export check

This patch adds a temporary exception for project testlabs, so that
new instances created in the project will ignore the showmount based
blocking mechanism for nfs mounts to become available, so I can test
https://gerrit.wikimedia.org/r/#/c/368223/.

This patch can be reverted as soon as the testing is done, and we can
then get rid of the block-for-export check when the updated VM images
are rolled out.

Bug: T171508
Change-Id: Ie32dcc10c81e018fd18b5b582350ee9d5e60622a
---
M modules/labstore/manifests/nfs_mount.pp
1 file changed, 21 insertions(+), 15 deletions(-)

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



diff --git a/modules/labstore/manifests/nfs_mount.pp 
b/modules/labstore/manifests/nfs_mount.pp
index c0ad900..5ee1bad 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -130,24 +130,30 @@
 
 if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
 
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/labstore/block-for-export',
+# This project!=testlabs check is a super temporary check put in place 
to
+# test new VM images that include alternative functionality to block 
until
+# all the mounts are available, that would deprecate the following 
showmount
+# based mechanism if it works correctly.
+# TODO: Revert this check after testing (T174590)
+if ($project != 'testlabs') {
+if $block {
+if !defined(File['/usr/local/sbin/block-for-export']) {
+# This script will block until the NFS volume is available
+file { '/usr/local/sbin/block-for-export':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/labstore/block-for-export',
+}
+}
+exec { "block-for-nfs-${name}":
+command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
+require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
+unless  => "/bin/mountpoint -q ${mount_path}",
 }
 }
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
-unless  => "/bin/mountpoint -q ${mount_path}",
-}
 }
-
 # 'present' is meant to manage only the status of entries in /etc/fstab
 # a notable exception to this is in the case of an entry managed as 
'present'
 # puppet will attempt to remount that entry when options change /but/ 
only

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie32dcc10c81e018fd18b5b582350ee9d5e60622a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: nfsmount: Add temporary exception to the block-for-export check

2017-08-30 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374845 )

Change subject: nfsmount: Add temporary exception to the block-for-export check
..

nfsmount: Add temporary exception to the block-for-export check

This patch adds a temporary exception for project testlabs, so that
new instances created in the project will ignore the showmount based
blocking mechanism for nfs mounts to become available, so I can test
https://gerrit.wikimedia.org/r/#/c/368223/.

This patch can be reverted as soon as the testing is done, and we can
then get rid of the block-for-export check when the updated VM images
are rolled out.

Bug: T171508
Change-Id: Ie32dcc10c81e018fd18b5b582350ee9d5e60622a
---
M modules/labstore/manifests/nfs_mount.pp
1 file changed, 21 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/374845/1

diff --git a/modules/labstore/manifests/nfs_mount.pp 
b/modules/labstore/manifests/nfs_mount.pp
index c0ad900..00bd093 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -130,24 +130,30 @@
 
 if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
 
-if $block {
-if !defined(File['/usr/local/sbin/block-for-export']) {
-# This script will block until the NFS volume is available
-file { '/usr/local/sbin/block-for-export':
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/labstore/block-for-export',
+# This project!=testlabs check is a super temporary check put in place 
to
+# test new VM images that include alternative functionality to block 
until
+# all the mounts are available, that would deprecate the following 
showmount
+# based mechanism if it works correctly.
+# TODO: Revert this check after testing
+if ($project != 'testlabs') {
+if $block {
+if !defined(File['/usr/local/sbin/block-for-export']) {
+# This script will block until the NFS volume is available
+file { '/usr/local/sbin/block-for-export':
+ensure => present,
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 
'puppet:///modules/labstore/block-for-export',
+}
+}
+exec { "block-for-nfs-${name}":
+command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
+require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
+unless  => "/bin/mountpoint -q ${mount_path}",
 }
 }
-exec { "block-for-nfs-${name}":
-command => "/usr/local/sbin/block-for-export ${server} 
project/${project} ${block_timeout}",
-require => [File['/etc/modprobe.d/nfs-no-idmap.conf'], 
File['/usr/local/sbin/block-for-export']],
-unless  => "/bin/mountpoint -q ${mount_path}",
-}
 }
-
 # 'present' is meant to manage only the status of entries in /etc/fstab
 # a notable exception to this is in the case of an entry managed as 
'present'
 # puppet will attempt to remount that entry when options change /but/ 
only

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: firstboot: Prevent non-root logins while NFS mounts aren't a...

2017-08-28 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368223 )

Change subject: firstboot: Prevent non-root logins while NFS mounts aren't 
available
..


firstboot: Prevent non-root logins while NFS mounts aren't available

Bug: T171508
Change-Id: If8e07f5e231150cfe8eb3fc6ac662e35ebc27c3d
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 36 insertions(+), 0 deletions(-)

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



diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index 0b714a1..f93be69 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -2,6 +2,9 @@
 
 set -x
 
+# Prevent non-root logins while the VM is being setup
+echo "VM is work in progress" > /etc/nologin
+
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
 systemctl restart rsyslog.service
@@ -186,3 +189,18 @@
 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff 
--waitforcert=10 --certname=${fqdn} --server=${master}
 apt-get update
 puppet agent -t
+
+# Ensure all NFS mounts are mounted
+mount_attempts=1
+until [ $mount_attempts -gt 10 ]
+do
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
+((mount_attempts++))
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+# Sleep for 10s before next attempt
+sleep 10
+done
+
+# Remove the non-root login restriction
+rm /etc/nologin
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index c8c18aa..dcd1784 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -x
 
+# Prevent non-root logins while the VM is being setup
+echo "VM is work in progress" > /etc/nologin
+
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
 restart rsyslog
@@ -120,3 +123,18 @@
 apt-get -y install openssh-server
 
 puppet agent -t
+
+# Ensure all NFS mounts are mounted
+mount_attempts=1
+until [ $mount_attempts -gt 10 ]
+do
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
+echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >> 
/etc/nologin
+((mount_attempts++))
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+# Sleep for 10s before next attempt
+sleep 10
+done
+
+# Remove the non-root login restriction
+rm /etc/nologin

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8e07f5e231150cfe8eb3fc6ac662e35ebc27c3d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: wmcs: generate /etc/dbusers.yaml with ordered_yaml()

2017-08-28 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372876 )

Change subject: wmcs: generate /etc/dbusers.yaml with ordered_yaml()
..


wmcs: generate /etc/dbusers.yaml with ordered_yaml()

This file is named and parsed as yaml, but currently output using
the wmflib ordered_json() function. JSON is a proper subset of YAML so
this works just fine for machine parsing, but reading the collapsed JSON
data is harder for humans than reading YAML's block style encoding.

Change-Id: I248db35bc02c87293ddb4833bc9185530ddc220e
---
M modules/role/manifests/labs/db/maintain_dbusers.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/labs/db/maintain_dbusers.pp 
b/modules/role/manifests/labs/db/maintain_dbusers.pp
index 0e8ed9b..c23fc695 100644
--- a/modules/role/manifests/labs/db/maintain_dbusers.pp
+++ b/modules/role/manifests/labs/db/maintain_dbusers.pp
@@ -75,7 +75,7 @@
 }
 
 file { '/etc/dbusers.yaml':
-content => ordered_json($creds),
+content => ordered_yaml($creds),
 owner   => 'root',
 group   => 'root',
 mode=> '0400',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I248db35bc02c87293ddb4833bc9185530ddc220e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
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]: shinkengen: Update package declaration to require_package

2017-08-03 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370090 )

Change subject: shinkengen: Update package declaration to require_package
..


shinkengen: Update package declaration to require_package

Puppet complains of python-yaml duplicate declaration

Change-Id: I5b6a9f3e5da1c8e07723da334068f11cbc6ce011
---
M modules/shinken/manifests/shinkengen.pp
1 file changed, 3 insertions(+), 9 deletions(-)

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



diff --git a/modules/shinken/manifests/shinkengen.pp 
b/modules/shinken/manifests/shinkengen.pp
index c142d11..dc98c54 100644
--- a/modules/shinken/manifests/shinkengen.pp
+++ b/modules/shinken/manifests/shinkengen.pp
@@ -5,14 +5,8 @@
 class shinken::shinkengen {
 include shinken
 
-package { [
-'python3-yaml',
-'python3-requests',
-'python-yaml',
-'python-requests',
-]:
-ensure => present,
-}
+require_package('python-requests',
+'python-yaml')
 
 file { '/etc/shinkengen.yaml':
 content => template('shinken/shinkengen.yaml.erb'),
@@ -25,7 +19,7 @@
 owner   => 'shinken',
 group   => 'shinken',
 mode=> '0555',
-require => Package['python3-yaml'],
+require => Package['python-yaml'],
 }
 
 exec { '/usr/local/bin/shinkengen':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b6a9f3e5da1c8e07723da334068f11cbc6ce011
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: shinkengen: Update package declaration to require_package to...

2017-08-03 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370090 )

Change subject: shinkengen: Update package declaration to require_package to 
avoid duplicate decl.
..

shinkengen: Update package declaration to require_package to avoid duplicate 
decl.

Change-Id: I5b6a9f3e5da1c8e07723da334068f11cbc6ce011
---
M modules/shinken/manifests/shinkengen.pp
1 file changed, 2 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/370090/1

diff --git a/modules/shinken/manifests/shinkengen.pp 
b/modules/shinken/manifests/shinkengen.pp
index c142d11..b619e21 100644
--- a/modules/shinken/manifests/shinkengen.pp
+++ b/modules/shinken/manifests/shinkengen.pp
@@ -5,14 +5,8 @@
 class shinken::shinkengen {
 include shinken
 
-package { [
-'python3-yaml',
-'python3-requests',
-'python-yaml',
-'python-requests',
-]:
-ensure => present,
-}
+require_package('python-requests',
+'python-yaml')
 
 file { '/etc/shinkengen.yaml':
 content => template('shinken/shinkengen.yaml.erb'),

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: shinkengen: Downgrade to python version 2

2017-08-03 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370001 )

Change subject: shinkengen: Downgrade to python version 2
..


shinkengen: Downgrade to python version 2

We are converting all openstack library use to python2 for sanity
and avoiding surprises, since py3 modules of the openstack library
are not available in Jessie land.

Change-Id: I372fe8b94701f3ed04266ee6dbc5ef3667cee6d8
---
M modules/shinken/files/shinkengen
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index 7ea97c4..3e45399 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
 #   Copyright 2014 Yuvi Panda 
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,7 +58,7 @@
 def __str__(self):
 max_key_len = max(len(key) for key in self.properties.keys())
 config_str = ''.join('%-*s   %s\n' % (max_key_len, key, value)
- for key, value in self.properties.items())
+ for key, value in self.properties.iteritems())
 return 'define %s {\n%s}\n' % (self.type, config_str)
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I372fe8b94701f3ed04266ee6dbc5ef3667cee6d8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
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]: openstack: revert shenkengen to py2 libs

2017-08-03 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369987 )

Change subject: openstack: revert shenkengen to py2 libs
..


openstack: revert shenkengen to py2 libs

Bug: T169099
Change-Id: I84fd3f2baf0ded642bdb149749a1241c0206cc6a
---
M modules/shinken/manifests/shinkengen.pp
1 file changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/modules/shinken/manifests/shinkengen.pp 
b/modules/shinken/manifests/shinkengen.pp
index a5199cb..c142d11 100644
--- a/modules/shinken/manifests/shinkengen.pp
+++ b/modules/shinken/manifests/shinkengen.pp
@@ -8,12 +8,10 @@
 package { [
 'python3-yaml',
 'python3-requests',
+'python-yaml',
+'python-requests',
 ]:
 ensure => present,
-}
-
-if $::openstack::version == 'liberty' or ! $::openstack::version {
-fail('openstack::version must be set to Mitaka or later for python3 
dependencies.')
 }
 
 file { '/etc/shinkengen.yaml':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84fd3f2baf0ded642bdb149749a1241c0206cc6a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Madhuvishy 
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]: nfs-exportd: Downgrade to python version 2

2017-08-03 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369980 )

Change subject: nfs-exportd: Downgrade to python version 2
..


nfs-exportd: Downgrade to python version 2

Openstack Py3 modules are not available on Jessie

Change-Id: I978099e70cf8dc1cc96e0b6483bdfb5de9c14501
---
M modules/labstore/files/nfs-exportd
1 file changed, 20 insertions(+), 9 deletions(-)

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



diff --git a/modules/labstore/files/nfs-exportd 
b/modules/labstore/files/nfs-exportd
index 20f82a8..8af1ac3 100755
--- a/modules/labstore/files/nfs-exportd
+++ b/modules/labstore/files/nfs-exportd
@@ -1,7 +1,6 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
 #
-#  Copyright © 2015 Marc-André Pelletier 
-#  Copyright © 2015 Yuvi Panda 
+# Copyright (c) 2016 Wikimedia Foundation, Inc.
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above
@@ -19,12 +18,12 @@
 #  THIS FILE IS MANAGED BY PUPPET
 #
 
-import ipaddress
 import argparse
 import yaml
 import os
 import time
 import logging
+import socket
 import sys
 import subprocess
 
@@ -41,11 +40,23 @@
 def is_valid_ipv4(ip):
 """
 Returns true if ip is a valid ipv4 address
+
+This test is a temp proxy for the py3 ipaddress module based check,
+it tries to convert a dot separated ipv4 address to a 32-bit packed binary
+format, and fails if the conversion doesn't succeed.
+
+This check is a more permissive than the ipaddress library check,
+and follows http://man7.org/linux/man-pages/man3/inet_aton.3.html to check
+if the address is valid, and won't validate if the string has 4 octets, 
etc.
+
+We can use this however, because we get instance ips from Keystone, and
+mainly need to check if the value is not empty, or cannot be a valid IP
+string
 """
 try:
-ipaddress.IPv4Address(ip)
+socket.inet_aton(ip)
 return True
-except ipaddress.AddressValueError:
+except socket.error:
 return False
 
 
@@ -79,7 +90,7 @@
 """
 Return a list of Instance internal IPs for a given project
 
-This uses the Wikitech API to fetch this data
+This uses the Keystone API to fetch this data
 """
 client = novaclient.Client(
 "2.0",
@@ -117,9 +128,9 @@
 :returns: list
 """
 projects = []
-for name, config in mounts_config['private'].items():
+for name, config in mounts_config['private'].iteritems():
 if 'mounts' in config:
-mounts = [k for k, v in config['mounts'].items()
+mounts = [k for k, v in config['mounts'].iteritems()
   if k in VOLUMES_NEEDING_EXPORTS and v]
 if len(mounts) == 0:
 # Skip project if it has no private mounts

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I978099e70cf8dc1cc96e0b6483bdfb5de9c14501
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Madhuvishy 
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]: shinkengen: Downgrade to python version 2

2017-08-03 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370001 )

Change subject: shinkengen: Downgrade to python version 2
..

shinkengen: Downgrade to python version 2

We are converting all openstack library use to python2 for sanity
and avoiding surprises, since py3 modules of the openstack library
are not available in Jessie land.

Change-Id: I372fe8b94701f3ed04266ee6dbc5ef3667cee6d8
---
M modules/shinken/files/shinkengen
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index 51b5e38..1846054 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
 #   Copyright 2014 Yuvi Panda 
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,7 +58,7 @@
 def __str__(self):
 max_key_len = max(len(key) for key in self.properties.keys())
 config_str = ''.join('%-*s   %s\n' % (max_key_len, key, value)
- for key, value in self.properties.items())
+ for key, value in self.properties.iteritems())
 return 'define %s {\n%s}\n' % (self.type, config_str)
 
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs-exportd: Downgrade to python version 2

2017-08-03 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369980 )

Change subject: nfs-exportd: Downgrade to python version 2
..

nfs-exportd: Downgrade to python version 2

Openstack Py3 modules are not available on Jessie

Change-Id: I978099e70cf8dc1cc96e0b6483bdfb5de9c14501
---
M modules/labstore/files/nfs-exportd
1 file changed, 20 insertions(+), 9 deletions(-)


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

diff --git a/modules/labstore/files/nfs-exportd 
b/modules/labstore/files/nfs-exportd
index 20f82a8..8af1ac3 100755
--- a/modules/labstore/files/nfs-exportd
+++ b/modules/labstore/files/nfs-exportd
@@ -1,7 +1,6 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
 #
-#  Copyright © 2015 Marc-André Pelletier 
-#  Copyright © 2015 Yuvi Panda 
+# Copyright (c) 2016 Wikimedia Foundation, Inc.
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above
@@ -19,12 +18,12 @@
 #  THIS FILE IS MANAGED BY PUPPET
 #
 
-import ipaddress
 import argparse
 import yaml
 import os
 import time
 import logging
+import socket
 import sys
 import subprocess
 
@@ -41,11 +40,23 @@
 def is_valid_ipv4(ip):
 """
 Returns true if ip is a valid ipv4 address
+
+This test is a temp proxy for the py3 ipaddress module based check,
+it tries to convert a dot separated ipv4 address to a 32-bit packed binary
+format, and fails if the conversion doesn't succeed.
+
+This check is a more permissive than the ipaddress library check,
+and follows http://man7.org/linux/man-pages/man3/inet_aton.3.html to check
+if the address is valid, and won't validate if the string has 4 octets, 
etc.
+
+We can use this however, because we get instance ips from Keystone, and
+mainly need to check if the value is not empty, or cannot be a valid IP
+string
 """
 try:
-ipaddress.IPv4Address(ip)
+socket.inet_aton(ip)
 return True
-except ipaddress.AddressValueError:
+except socket.error:
 return False
 
 
@@ -79,7 +90,7 @@
 """
 Return a list of Instance internal IPs for a given project
 
-This uses the Wikitech API to fetch this data
+This uses the Keystone API to fetch this data
 """
 client = novaclient.Client(
 "2.0",
@@ -117,9 +128,9 @@
 :returns: list
 """
 projects = []
-for name, config in mounts_config['private'].items():
+for name, config in mounts_config['private'].iteritems():
 if 'mounts' in config:
-mounts = [k for k, v in config['mounts'].items()
+mounts = [k for k, v in config['mounts'].iteritems()
   if k in VOLUMES_NEEDING_EXPORTS and v]
 if len(mounts) == 0:
 # Skip project if it has no private mounts

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: firstboot: Prevent non-root logins while NFS mounts aren't a...

2017-07-27 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368223 )

Change subject: firstboot: Prevent non-root logins while NFS mounts aren't 
available
..

firstboot: Prevent non-root logins while NFS mounts aren't available

Bug: T171508
Change-Id: If8e07f5e231150cfe8eb3fc6ac662e35ebc27c3d
---
M modules/labs_bootstrapvz/files/firstboot.sh
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index 7e21852..37ed361 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -2,6 +2,9 @@
 
 set -x
 
+# Prevent non-root logins while the VM is being setup
+touch /etc/nologin
+
 echo 'Enabling console logging for puppet while it does the initial run'
 echo 'daemon.* |/dev/console' > /etc/rsyslog.d/60-puppet.conf
 systemctl restart rsyslog.service
@@ -185,3 +188,10 @@
 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff 
--waitforcert=10 --certname=${fqdn} --server=${master}
 apt-get update
 puppet agent -t
+
+# Ensure all NFS mounts are mounted
+/usr/local/sbin/nfs-mount-manager clean
+/usr/bin/timeout --preserve-status -k 60s 180s /bin/mount -a
+
+# Remove the non-root login restriction
+rm /etc/nologin

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore block_sync: Use the logging library instead of print

2017-07-27 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367742 )

Change subject: labstore block_sync: Use the logging library instead of print
..


labstore block_sync: Use the logging library instead of print

Is cleaner and more consistent with our other python3 scripts

Change-Id: I949db2594891c9a153d1b73864b94895cea80280
---
M modules/labstore/files/block_sync.py
1 file changed, 15 insertions(+), 2 deletions(-)

Approvals:
  Madhuvishy: Verified; Looks good to me, approved
  Rush: Looks good to me, but someone else must approve



diff --git a/modules/labstore/files/block_sync.py 
b/modules/labstore/files/block_sync.py
index 1afab33..0f437f8 100644
--- a/modules/labstore/files/block_sync.py
+++ b/modules/labstore/files/block_sync.py
@@ -2,6 +2,7 @@
 
 import argparse
 import fcntl
+import logging
 import os
 import shlex
 import subprocess
@@ -62,7 +63,7 @@
 if __name__ == '__main__':
 
 if os.geteuid() != 0:
-print("Script needs to be run as root")
+logging.error("Script needs to be run as root")
 sys.exit(1)
 
 argparser = argparse.ArgumentParser()
@@ -105,7 +106,19 @@
 help='Remote user to run commands over ssh as',
 default='root',
 )
+argparser.add_argument(
+'--debug',
+help='Turn on debug logging',
+action='store_true'
+)
+
 args = argparser.parse_args()
+
+logging.basicConfig(
+format='%(asctime)s %(levelname)s %(message)s',
+level=logging.DEBUG if args.debug else logging.INFO)
+
+logging.debug(args)
 
 local_device = '/dev/{}/{}'.format(args.l_vg, args.l_lv)
 
@@ -115,7 +128,7 @@
 try:
 try:
 run_local('/bin/findmnt --notruncate -P -n -c 
{}'.format(local_device))
-print('Local device is mounted. Operations may be unsafe')
+logging.error('Local device is mounted. Operations may be unsafe')
 sys.exit(1)
 except subprocess.CalledProcessError:
 # Continue if the local device is not mounted

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I949db2594891c9a153d1b73864b94895cea80280
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Volans 
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]: labstore block_sync: Use the logging library instead of print

2017-07-25 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367742 )

Change subject: labstore block_sync: Use the logging library instead of print
..

labstore block_sync: Use the logging library instead of print

Is cleaner and more consistent with our other python3 scripts

Change-Id: I949db2594891c9a153d1b73864b94895cea80280
---
M modules/labstore/files/block_sync.py
1 file changed, 15 insertions(+), 2 deletions(-)


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

diff --git a/modules/labstore/files/block_sync.py 
b/modules/labstore/files/block_sync.py
index 1afab33..0f437f8 100644
--- a/modules/labstore/files/block_sync.py
+++ b/modules/labstore/files/block_sync.py
@@ -2,6 +2,7 @@
 
 import argparse
 import fcntl
+import logging
 import os
 import shlex
 import subprocess
@@ -62,7 +63,7 @@
 if __name__ == '__main__':
 
 if os.geteuid() != 0:
-print("Script needs to be run as root")
+logging.error("Script needs to be run as root")
 sys.exit(1)
 
 argparser = argparse.ArgumentParser()
@@ -105,7 +106,19 @@
 help='Remote user to run commands over ssh as',
 default='root',
 )
+argparser.add_argument(
+'--debug',
+help='Turn on debug logging',
+action='store_true'
+)
+
 args = argparser.parse_args()
+
+logging.basicConfig(
+format='%(asctime)s %(levelname)s %(message)s',
+level=logging.DEBUG if args.debug else logging.INFO)
+
+logging.debug(args)
 
 local_device = '/dev/{}/{}'.format(args.l_vg, args.l_lv)
 
@@ -115,7 +128,7 @@
 try:
 try:
 run_local('/bin/findmnt --notruncate -P -n -c 
{}'.format(local_device))
-print('Local device is mounted. Operations may be unsafe')
+logging.error('Local device is mounted. Operations may be unsafe')
 sys.exit(1)
 except subprocess.CalledProcessError:
 # Continue if the local device is not mounted

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore backups: Switch secondary cluster backup source

2017-07-22 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367116 )

Change subject: labstore backups: Switch secondary cluster backup source
..


labstore backups: Switch secondary cluster backup source

Switching backup source to labstore1005 which is
the passive node atm

Change-Id: I7cbe5dc7443779c264d7c5d2f5efc21b8ef473a9
---
M modules/role/manifests/labs/nfs/secondary_backup/misc.pp
M modules/role/manifests/labs/nfs/secondary_backup/tools.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp 
b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
index a9e312f..cd910bd 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
@@ -8,7 +8,7 @@
 }
 
 labstore::device_backup { 'secondary-misc':
-remotehost  => 'labstore1004.eqiad.wmnet',
+remotehost  => 'labstore1005.eqiad.wmnet',
 remote_vg   => 'misc',
 remote_lv   => 'misc-project',
 remote_snapshot => 'misc-snap',
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp 
b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
index adf4fb9..fd7c4c5 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
@@ -8,7 +8,7 @@
 }
 
 labstore::device_backup { 'secondary-tools':
-remotehost  => 'labstore1004.eqiad.wmnet',
+remotehost  => 'labstore1005.eqiad.wmnet',
 remote_vg   => 'tools',
 remote_lv   => 'tools-project',
 remote_snapshot => 'tools-snap',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cbe5dc7443779c264d7c5d2f5efc21b8ef473a9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Madhuvishy 
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]: labstore backups: Switch secondary labstore cluster backup s...

2017-07-22 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367116 )

Change subject: labstore backups: Switch secondary labstore cluster backup 
source to labstore1005
..

labstore backups: Switch secondary labstore cluster backup source to 
labstore1005

Change-Id: I7cbe5dc7443779c264d7c5d2f5efc21b8ef473a9
---
M modules/role/manifests/labs/nfs/secondary_backup/misc.pp
M modules/role/manifests/labs/nfs/secondary_backup/tools.pp
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp 
b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
index a9e312f..cd910bd 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
@@ -8,7 +8,7 @@
 }
 
 labstore::device_backup { 'secondary-misc':
-remotehost  => 'labstore1004.eqiad.wmnet',
+remotehost  => 'labstore1005.eqiad.wmnet',
 remote_vg   => 'misc',
 remote_lv   => 'misc-project',
 remote_snapshot => 'misc-snap',
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp 
b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
index adf4fb9..fd7c4c5 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
@@ -8,7 +8,7 @@
 }
 
 labstore::device_backup { 'secondary-tools':
-remotehost  => 'labstore1004.eqiad.wmnet',
+remotehost  => 'labstore1005.eqiad.wmnet',
 remote_vg   => 'tools',
 remote_lv   => 'tools-project',
 remote_snapshot => 'tools-snap',

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

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

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

  1   2   3   4   5   >