Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404063 )
Change subject: parsoid::testing: convert role to profile
......................................................................
parsoid::testing: convert role to profile
Change-Id: Ic1ed5e6719e1ec2c5cf017a8667b8fd3fedd076e
---
A modules/profile/manifests/parsoid/testing.pp
M modules/role/manifests/parsoid/testing.pp
2 files changed, 63 insertions(+), 59 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, but someone else must approve
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/parsoid/testing.pp
b/modules/profile/manifests/parsoid/testing.pp
new file mode 100644
index 0000000..a7a3eb1
--- /dev/null
+++ b/modules/profile/manifests/parsoid/testing.pp
@@ -0,0 +1,62 @@
+# Parsoid roundtrip testing, Parsoid & PHP parser visual diff testing
+class profile::parsoid::testing (
+ $parsoid_port = hiera('parsoid::testing::parsoid_port'),
+) {
+ class { '::parsoid':
+ port => $parsoid_port,
+ settings_file => '/srv/deployment/parsoid/deploy/src/localsettings.js',
+ deployment => 'git',
+ }
+
+ file { '/usr/local/bin/update_parsoid.sh':
+ source =>
'puppet:///modules/parsoid/parsoid_testing.update_parsoid.sh',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ }
+
+ # Use this parsoid instance for parsoid rt-testing
+ file { '/srv/deployment/parsoid/deploy/src/localsettings.js':
+ content =>
template('testreduce/parsoid-rt-client.rttest.localsettings.js.erb'),
+ owner => 'root',
+ group => 'wikidev',
+ mode => '0444',
+ before => Service['parsoid'],
+ }
+
+ # mysql client and configuration to provide command line access to
+ # parsoid testing database
+ include ::passwords::testreduce::mysql
+ $parsoid_cli_password = $passwords::testreduce::mysql::mysql_client_pass
+ $parsoid_test_db_host = 'm5-master.eqiad.wmnet'
+
+ package { [
+ 'mysql-client',
+ ]: ensure => present,
+ }
+
+ file { '/etc/my.cnf':
+ content =>
template('role/mariadb/mysqld_config/parsoid_testing.my.cnf'),
+ owner => 'root',
+ group => 'parsoid-test-roots',
+ mode => '0440',
+ }
+
+ nginx::site { 'nginx-parsoid-testing':
+ content => template('parsoid/parsoid-testing.nginx.conf.erb'),
+ notify => Service['nginx'],
+ }
+
+ ferm::service { 'nginx-parsoid-testing':
+ proto => 'tcp',
+ port => 8001,
+ srange => '$PRODUCTION_NETWORKS',
+ }
+
+ # Presented by the @remote links shown on parsoid-rt-tests.wikimedia.org
+ ferm::service { 'parsoid-testing':
+ proto => 'tcp',
+ port => 8142,
+ srange => '$PRODUCTION_NETWORKS',
+ }
+}
diff --git a/modules/role/manifests/parsoid/testing.pp
b/modules/role/manifests/parsoid/testing.pp
index ec686c4..a2825b8 100644
--- a/modules/role/manifests/parsoid/testing.pp
+++ b/modules/role/manifests/parsoid/testing.pp
@@ -5,63 +5,5 @@
description => 'Parsoid server (rt-testing, visual-diffing, etc.)'
}
- $parsoid_port = hiera('parsoid::testing::parsoid_port')
-
- class { '::parsoid':
- port => $parsoid_port,
- settings_file => '/srv/deployment/parsoid/deploy/src/localsettings.js',
- deployment => 'git',
- }
-
- file { '/usr/local/bin/update_parsoid.sh':
- source =>
'puppet:///modules/parsoid/parsoid_testing.update_parsoid.sh',
- owner => 'root',
- group => 'root',
- mode => '0555',
- }
-
- # Use this parsoid instance for parsoid rt-testing
- file { '/srv/deployment/parsoid/deploy/src/localsettings.js':
- content =>
template('testreduce/parsoid-rt-client.rttest.localsettings.js.erb'),
- owner => 'root',
- group => 'wikidev',
- mode => '0444',
- before => Service['parsoid'],
- }
-
- # mysql client and configuration to provide command line access to
- # parsoid testing database
- include ::passwords::testreduce::mysql
- $parsoid_cli_password = $passwords::testreduce::mysql::mysql_client_pass
- $parsoid_test_db_host = 'm5-master.eqiad.wmnet'
-
- package { [
- 'mysql-client',
- ]: ensure => present,
- }
-
- file { '/etc/my.cnf':
- content =>
template('role/mariadb/mysqld_config/parsoid_testing.my.cnf'),
- owner => 'root',
- group => 'parsoid-test-roots',
- mode => '0440',
- }
-
- nginx::site { 'nginx-parsoid-testing':
- content => template('parsoid/parsoid-testing.nginx.conf.erb'),
- notify => Service['nginx'],
- }
-
- ferm::service { 'nginx-parsoid-testing':
- proto => 'tcp',
- port => 8001,
- srange => '$PRODUCTION_NETWORKS',
- }
-
- # Presented by the @remote links shown on parsoid-rt-tests.wikimedia.org
- ferm::service { 'parsoid-testing':
- proto => 'tcp',
- port => 8142,
- srange => '$PRODUCTION_NETWORKS',
- }
+ include ::profile::parsoid::testing
}
--
To view, visit https://gerrit.wikimedia.org/r/404063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1ed5e6719e1ec2c5cf017a8667b8fd3fedd076e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
