Alexandros Kosiaris has submitted this change and it was merged.
Change subject: osm export the expired tile list
......................................................................
osm export the expired tile list
use the rsync module and define a repo to export to labs vms the list of
expired tiles.
While at it, do some minor reorganization of the osm module
Change-Id: I4b686216d167b572e7333521ab54d4e974d0facc
---
M manifests/role/osm.pp
R modules/osm/manifests/init.pp
R modules/osm/spec/classes/osm_spec.rb
3 files changed, 24 insertions(+), 4 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/osm.pp b/manifests/role/osm.pp
index 7644932..0bf3388 100644
--- a/manifests/role/osm.pp
+++ b/manifests/role/osm.pp
@@ -27,7 +27,7 @@
class role::osm::master {
include role::osm::common
include postgresql::postgis
- include osm::packages
+ include osm
include passwords::osm
class { 'postgresql::master':
@@ -142,6 +142,26 @@
method => 'md5',
database => 'wikimaps_atlas',
}
+
+ include rsync::server
+ rsync::server::module { 'osm_expired_tiles':
+ path => '/srv/osm_expire',
+ comment => 'OpenStreetMap expired tile list',
+ uid => 'postgres',
+ gid => 'postgres',
+ }
+
+ ferm::service { 'rsync_from_labs':
+ desc => 'Allow labs machines to get the expired OSM tile list',
+ prio => '50',
+ proto => 'tcp',
+ port => 873,
+ srange => '($EQIAD_PRIVATE_LABS-INSTANCES1-A-EQIAD
$EQIAD_PRIVATE_LABS-INSTANCES1-A-EQIAD $EQIAD_PRIVATE_LABS-INSTANCES1-A-EQIAD
$EQIAD_PRIVATE_LABS-INSTANCES1-A-EQIAD)',
+ }
+ nrpe::monitor_service { 'check_rsync_server_running':
+ description => 'Check if rsync server is running',
+ command => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:4
--ereg-argument-array 'rsync --daemon'",
+ }
}
class role::osm::slave {
diff --git a/modules/osm/manifests/packages.pp b/modules/osm/manifests/init.pp
similarity index 71%
rename from modules/osm/manifests/packages.pp
rename to modules/osm/manifests/init.pp
index 83a8527..8512ed1 100644
--- a/modules/osm/manifests/packages.pp
+++ b/modules/osm/manifests/init.pp
@@ -1,6 +1,6 @@
#
-class osm::packages($ensure='present') {
+class osm($ensure='present') {
package { [
'osm2pgsql',
'osmosis',
diff --git a/modules/osm/spec/classes/osm_packages_spec.rb
b/modules/osm/spec/classes/osm_spec.rb
similarity index 85%
rename from modules/osm/spec/classes/osm_packages_spec.rb
rename to modules/osm/spec/classes/osm_spec.rb
index e5f7280..a58f4c3 100644
--- a/modules/osm/spec/classes/osm_packages_spec.rb
+++ b/modules/osm/spec/classes/osm_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe 'osm::packages', :type => :class do
+describe 'osm', :type => :class do
let(:params) { {
:ensure => 'present',
}
@@ -12,7 +12,7 @@
end
end
-describe 'osm::packages', :type => :class do
+describe 'osm', :type => :class do
let(:params) { {
:ensure => 'absent',
}
--
To view, visit https://gerrit.wikimedia.org/r/169242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b686216d167b572e7333521ab54d4e974d0facc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
