Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131433
Change subject: Remove a level of indentation from role/gerrit.pp
......................................................................
Remove a level of indentation from role/gerrit.pp
Nested classes are a bit evil, get rid of the outermost level
role::gerrit and prefix each subclass accordingly.
Change-Id: I54de6a23b6f65b0d45216225b8fc69f575988078
---
M manifests/role/gerrit.pp
1 file changed, 169 insertions(+), 171 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/131433/1
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index b532e69..265cedc 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -1,187 +1,185 @@
# manifests/role/gerrit.pp
-class role::gerrit {
- class labs {
- system::role { 'role::gerrit::labs': description => 'Gerrit in labs!' }
+class role::gerrit::labs {
+ system::role { 'role::gerrit::labs': description => 'Gerrit in labs!' }
- class { 'gerrit::instance':
- db_host => 'gerrit-db',
- host => 'gerrit-dev.wmflabs.org',
- ssh_key =>
'AAAAB3NzaC1yc2EAAAADAQABAAABAQDIb6jbDSyzSD/Pw8PfERVKtNkXgUteOTmZJjHtbOjuoC7Ty6dbvUMX+45GedcD1wAYkWEY26RhI1lW2yEwKvh7VWkKixXqPNyrQGvI+ldjYEyWsGlEHCNqsh37mJD5K3cwr7X/PMaxzxh7rjTk4uRKjtiga9bz1vTDRDaNlXcj84kifsu7xmCY1E+OL4oqqy7b3SKhOpcpZc7n5GonfRSeon5uFHVUjoZ57xQ8x2736zbuLBwMRKtaB+V63cU9ArL90XdVrWfbjI4Fzfex4tBG9fOvt8lINR62cjH5Lova2kZ6VBeUnJYdZ8V1mOSwtITjwkE0K98FNZdqaANZAH7V',
- ssl_cert => 'star.wmflabs',
- ssl_cert_key => 'star.wmflabs',
- }
+ class { 'gerrit::instance':
+ db_host => 'gerrit-db',
+ host => 'gerrit-dev.wmflabs.org',
+ ssh_key =>
'AAAAB3NzaC1yc2EAAAADAQABAAABAQDIb6jbDSyzSD/Pw8PfERVKtNkXgUteOTmZJjHtbOjuoC7Ty6dbvUMX+45GedcD1wAYkWEY26RhI1lW2yEwKvh7VWkKixXqPNyrQGvI+ldjYEyWsGlEHCNqsh37mJD5K3cwr7X/PMaxzxh7rjTk4uRKjtiga9bz1vTDRDaNlXcj84kifsu7xmCY1E+OL4oqqy7b3SKhOpcpZc7n5GonfRSeon5uFHVUjoZ57xQ8x2736zbuLBwMRKtaB+V63cU9ArL90XdVrWfbjI4Fzfex4tBG9fOvt8lINR62cjH5Lova2kZ6VBeUnJYdZ8V1mOSwtITjwkE0K98FNZdqaANZAH7V',
+ ssl_cert => 'star.wmflabs',
+ ssl_cert_key => 'star.wmflabs',
+ }
+}
+
+class role::gerrit::production::old {
+ system::role { 'role::gerrit::production': description => 'Old gerrit
master' }
+
+ class { "gerrit::instance":
+ db_host => 'db1048.eqiad.wmnet',
+ host => 'gerrit.wikimedia.org',
+ ssh_key =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==',
+ ssl_cert => 'gerrit.wikimedia.org',
+ ssl_cert_key => 'gerrit.wikimedia.org',
+ smtp_host => 'smtp.pmtpa.wmnet',
+ }
+}
+
+class role::gerrit::production {
+ system::role { 'role::gerrit::production': description => 'Gerrit master' }
+ include backup::host
+
+ backup::set { 'var-lib-gerrit2-review_site-git': }
+
+ interface::ip { 'role::gerrit::production_ipv4':
+ interface => 'eth0',
+ address => '208.80.154.81',
+ prefixlen => '32',
+ }
+ interface::ip { 'role::gerrit::production_ipv6':
+ interface => 'eth0',
+ address => '2620:0:861:3:208:80:154:81',
+ prefixlen => '128',
}
- class production::old {
- system::role { 'role::gerrit::production': description => 'Old gerrit
master' }
+ $replication_basic_push_refs = [
+ '+refs/heads/*:refs/heads/*',
+ '+refs/tags/*:refs/tags/*',
+ ]
- class { "gerrit::instance":
- db_host => 'db1048.eqiad.wmnet',
- host => 'gerrit.wikimedia.org',
- ssh_key =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==',
- ssl_cert => 'gerrit.wikimedia.org',
- ssl_cert_key => 'gerrit.wikimedia.org',
- smtp_host => 'smtp.pmtpa.wmnet',
- }
- }
+ class { "gerrit::instance":
+ db_host => 'db1048.eqiad.wmnet',
+ host => 'gerrit.wikimedia.org',
+ ssh_key =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==',
+ ssl_cert => 'gerrit.wikimedia.org',
+ ssl_cert_key => 'gerrit.wikimedia.org',
+ smtp_host => 'smtp.pmtpa.wmnet',
+ replication => {
+ # If adding a new entry, remember to add the fingerprint to
gerrit2's known_hosts
- class production {
- system::role { 'role::gerrit::production': description => 'Gerrit
master' }
- include backup::host
-
- backup::set { 'var-lib-gerrit2-review_site-git': }
-
- interface::ip { 'role::gerrit::production_ipv4':
- interface => 'eth0',
- address => '208.80.154.81',
- prefixlen => '32',
- }
- interface::ip { 'role::gerrit::production_ipv6':
- interface => 'eth0',
- address => '2620:0:861:3:208:80:154:81',
- prefixlen => '128',
- }
-
- $replication_basic_push_refs = [
- '+refs/heads/*:refs/heads/*',
- '+refs/tags/*:refs/tags/*',
- ]
-
- class { "gerrit::instance":
- db_host => 'db1048.eqiad.wmnet',
- host => 'gerrit.wikimedia.org',
- ssh_key =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==',
- ssl_cert => 'gerrit.wikimedia.org',
- ssl_cert_key => 'gerrit.wikimedia.org',
- smtp_host => 'smtp.pmtpa.wmnet',
- replication => {
- # If adding a new entry, remember to add the fingerprint to
gerrit2's known_hosts
-
- # All entries should have the same target directory
'/srv/ssd/gerrit'
- # since it is referenced in Jenkins jobs.
- 'jenkins-slaves' => {
- 'url' => [
- # Note: This is in single quotes on purpose. ${name}
is not
- # expected to be expanded by puppet but rather by
gerrit
-
'gerritsl...@gallium.wikimedia.org:/srv/ssd/gerrit/${name}.git',
-
'gerritslave@lanthanum.eqiad.wmnet:/srv/ssd/gerrit/${name}.git',
- ],
- 'threads' => '4',
- 'mirror' => 'true',
- },
- 'gitblit' => {
+ # All entries should have the same target directory
'/srv/ssd/gerrit'
+ # since it is referenced in Jenkins jobs.
+ 'jenkins-slaves' => {
+ 'url' => [
# Note: This is in single quotes on purpose. ${name} is not
# expected to be expanded by puppet but rather by gerrit
- 'url' =>
'gerritsl...@antimony.wikimedia.org:/var/lib/git/${name}.git',
- 'threads' => '4',
- 'authGroup' => 'mediawiki-replication',
- 'push' => '+refs/*:refs/*',
- 'mirror' => 'true',
- },
- 'github' => {
- # Note: This is in single quotes on purpose. ${name} is not
- # expected to be expanded by puppet but rather by gerrit
- 'url' =>
'g...@github.com:wikimedia/${name}',
- 'threads' => '4',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- },
- 'github-puppet-cdh4' => {
- 'url' =>
'g...@github.com:wikimedia/puppet-cdh4',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' => 'operations/puppet/cdh4',
- },
- 'github-puppet-jmxtrans' => {
- 'url' =>
'g...@github.com:wikimedia/puppet-jmxtrans',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' => 'operations/puppet/jmxtrans',
- },
- 'github-puppet-zookeeper' => {
- 'url' =>
'g...@github.com:wikimedia/puppet-zookeeper',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' => 'operations/puppet/zookeeper',
- },
- 'github-kraken' => {
- 'url' =>
'g...@github.com:wikimedia/kraken',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' => 'analytics/kraken',
- },
+
'gerritsl...@gallium.wikimedia.org:/srv/ssd/gerrit/${name}.git',
+
'gerritslave@lanthanum.eqiad.wmnet:/srv/ssd/gerrit/${name}.git',
+ ],
+ 'threads' => '4',
+ 'mirror' => 'true',
+ },
+ 'gitblit' => {
+ # Note: This is in single quotes on purpose. ${name} is not
+ # expected to be expanded by puppet but rather by gerrit
+ 'url' =>
'gerritsl...@antimony.wikimedia.org:/var/lib/git/${name}.git',
+ 'threads' => '4',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => '+refs/*:refs/*',
+ 'mirror' => 'true',
+ },
+ 'github' => {
+ # Note: This is in single quotes on purpose. ${name} is not
+ # expected to be expanded by puppet but rather by gerrit
+ 'url' => 'g...@github.com:wikimedia/${name}',
+ 'threads' => '4',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ },
+ 'github-puppet-cdh4' => {
+ 'url' =>
'g...@github.com:wikimedia/puppet-cdh4',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' => 'operations/puppet/cdh4',
+ },
+ 'github-puppet-jmxtrans' => {
+ 'url' =>
'g...@github.com:wikimedia/puppet-jmxtrans',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' => 'operations/puppet/jmxtrans',
+ },
+ 'github-puppet-zookeeper' => {
+ 'url' =>
'g...@github.com:wikimedia/puppet-zookeeper',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' => 'operations/puppet/zookeeper',
+ },
+ 'github-kraken' => {
+ 'url' => 'g...@github.com:wikimedia/kraken',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' => 'analytics/kraken',
+ },
- 'github-puppet-kafka' => {
- 'url' =>
'g...@github.com:wikimedia/puppet-kafka',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' => 'operations/puppet/kafka',
- },
- 'github-varnish-varnishkafka' => {
- 'url' =>
'g...@github.com:wikimedia/varnishkafka',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' =>
'operations/software/varnish/varnishkafka',
- },
- 'github-oojs-core' => {
- 'url' => 'g...@github.com:wikimedia/oojs',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' => 'oojs/core',
- },
- 'github-oojs-ui' => {
- 'url' =>
'g...@github.com:wikimedia/oojs-ui',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' => 'oojs/ui',
- },
- 'github-VisualEditor' => {
- 'url' =>
'g...@github.com:wikimedia/VisualEditor',
- 'threads' => '1',
- 'authGroup' => 'mediawiki-replication',
- 'push' => $replication_basic_push_refs,
- 'remoteNameStyle' => 'dash',
- 'mirror' => 'true',
- 'projects' => 'VisualEditor/VisualEditor',
- },
- }
+ 'github-puppet-kafka' => {
+ 'url' =>
'g...@github.com:wikimedia/puppet-kafka',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' => 'operations/puppet/kafka',
+ },
+ 'github-varnish-varnishkafka' => {
+ 'url' =>
'g...@github.com:wikimedia/varnishkafka',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' =>
'operations/software/varnish/varnishkafka',
+ },
+ 'github-oojs-core' => {
+ 'url' => 'g...@github.com:wikimedia/oojs',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' => 'oojs/core',
+ },
+ 'github-oojs-ui' => {
+ 'url' => 'g...@github.com:wikimedia/oojs-ui',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' => 'oojs/ui',
+ },
+ 'github-VisualEditor' => {
+ 'url' =>
'g...@github.com:wikimedia/VisualEditor',
+ 'threads' => '1',
+ 'authGroup' => 'mediawiki-replication',
+ 'push' => $replication_basic_push_refs,
+ 'remoteNameStyle' => 'dash',
+ 'mirror' => 'true',
+ 'projects' => 'VisualEditor/VisualEditor',
+ },
}
}
+}
- # Include this role on *any* production host that wants to
- # receive gerrit replication
- class production::replicationdest {
- system::role { 'role::gerrit::replicationdest': description =>
'Destination for gerrit replication' }
+# Include this role on *any* production host that wants to
+# receive gerrit replication
+class role::gerrit::production::replicationdest {
+ system::role { 'role::gerrit::replicationdest': description =>
'Destination for gerrit replication' }
- class { 'gerrit::replicationdest':
- sshkey =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw=='
- }
+ class { 'gerrit::replicationdest':
+ sshkey =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw=='
}
}
--
To view, visit https://gerrit.wikimedia.org/r/131433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54de6a23b6f65b0d45216225b8fc69f575988078
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
