Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402827 )
Change subject: Fix Thumbor role
......................................................................
Fix Thumbor role
The mediawiki::import::text definitions in the roles
themselves create circular dependencies for the Thumbor
role, define them in the corresponding classes instead.
Increase memory since the current size doesn’t cut it anymore.
Change-Id: I32af645fc7c76d7675063ce6671ee6c2aa35bbfd
---
M puppet/modules/role/manifests/swift.pp
M puppet/modules/role/manifests/varnish.pp
M puppet/modules/role/settings/thumbor.yaml
M puppet/modules/swift/manifests/init.pp
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/varnish/manifests/init.pp
6 files changed, 10 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/27/402827/1
diff --git a/puppet/modules/role/manifests/swift.pp
b/puppet/modules/role/manifests/swift.pp
index 1dbab32..7de5b82 100644
--- a/puppet/modules/role/manifests/swift.pp
+++ b/puppet/modules/role/manifests/swift.pp
@@ -25,8 +25,4 @@
env::var { 'ST_KEY':
value => $::swift::key,
}
-
- mediawiki::import::text { 'VagrantRoleSwift':
- content => template('role/swift/VagrantRoleSwift.wiki.erb'),
- }
}
diff --git a/puppet/modules/role/manifests/varnish.pp
b/puppet/modules/role/manifests/varnish.pp
index 56df63f..ece542c 100644
--- a/puppet/modules/role/manifests/varnish.pp
+++ b/puppet/modules/role/manifests/varnish.pp
@@ -16,9 +16,4 @@
'wgUsePrivateIPs' => true,
}
}
-
- $example_url = "http://${::role::mediawiki::hostname}:6081/";
- mediawiki::import::text { 'VagrantRoleVarnish':
- content => template('role/varnish/VagrantRoleVarnish.wiki.erb'),
- }
}
diff --git a/puppet/modules/role/settings/thumbor.yaml
b/puppet/modules/role/settings/thumbor.yaml
index 0ab1c48..05c2afb 100644
--- a/puppet/modules/role/settings/thumbor.yaml
+++ b/puppet/modules/role/settings/thumbor.yaml
@@ -1,4 +1,4 @@
-vagrant_ram: 768
+vagrant_ram: 1024
forward_ports:
8888: 8888 # thumbor
6081: 6081 # varnish
diff --git a/puppet/modules/swift/manifests/init.pp
b/puppet/modules/swift/manifests/init.pp
index ceac5fa..79dd0cb 100644
--- a/puppet/modules/swift/manifests/init.pp
+++ b/puppet/modules/swift/manifests/init.pp
@@ -228,4 +228,8 @@
require => File['/usr/local/lib/python2.7/dist-packages/wmf/'],
subscribe => File['/usr/local/lib/python2.7/dist-packages/wmf/'],
}
+
+ mediawiki::import::text { 'VagrantRoleSwift':
+ content => template('role/swift/VagrantRoleSwift.wiki.erb'),
+ }
}
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index d27ef9b..e3c9d9e 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -54,14 +54,6 @@
command => '/bin/systemctl stop thumbor'
}
- package { 'firejail':
- ensure => 'present',
- }
-
- package { 'python-logstash':
- ensure => 'present',
- }
-
$statsd_host = 'localhost'
$statsd_prefix = 'Thumbor'
diff --git a/puppet/modules/varnish/manifests/init.pp
b/puppet/modules/varnish/manifests/init.pp
index 821846c..918d0cc 100644
--- a/puppet/modules/varnish/manifests/init.pp
+++ b/puppet/modules/varnish/manifests/init.pp
@@ -279,4 +279,9 @@
subscribe => File[$conf],
},
}
+
+ $example_url = "http://${::role::mediawiki::hostname}:6081/";
+ mediawiki::import::text { 'VagrantRoleVarnish':
+ content => template('role/varnish/VagrantRoleVarnish.wiki.erb'),
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/402827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32af645fc7c76d7675063ce6671ee6c2aa35bbfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
