Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68643
Change subject: Remove embedding of classes
......................................................................
Remove embedding of classes
Change-Id: I803065b5ac9e4c7ddb84462922c0e4b3ba773613
---
M manifests/varnish.pp
1 file changed, 262 insertions(+), 264 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/68643/1
diff --git a/manifests/varnish.pp b/manifests/varnish.pp
index e4a2154..6ca71cf 100644
--- a/manifests/varnish.pp
+++ b/manifests/varnish.pp
@@ -1,285 +1,283 @@
# varnish.pp
-class varnish {
- class packages($version="installed") {
- package { [ 'varnish', 'libvarnishapi1', 'varnish-dbg' ]:
- ensure => $version;
- }
+class varnish::packages($version="installed") {
+ package { [ 'varnish', 'libvarnishapi1', 'varnish-dbg' ]:
+ ensure => $version;
}
+}
+
+class varnish::common {
+ require varnish::packages
- class common {
- require varnish::packages
-
- # Tune kernel settings
- include generic::sysctl::high-http-performance
+ # Tune kernel settings
+ include generic::sysctl::high-http-performance
- # Mount /var/lib/ganglia as tmpfs to avoid Linux flushing
mlocked
- # shm memory to disk
- mount { "/var/lib/varnish":
- require => Class["varnish::packages"],
- device => "tmpfs",
- fstype => "tmpfs",
- options => "noatime,defaults,size=512M",
- pass => 0,
- dump => 0,
- ensure => mounted;
- }
-
- file {
- "/usr/share/varnish/reload-vcl":
- source => "puppet:///files/varnish/reload-vcl",
- mode => 0555;
- }
+ # Mount /var/lib/ganglia as tmpfs to avoid Linux flushing mlocked
+ # shm memory to disk
+ mount { "/var/lib/varnish":
+ require => Class["varnish::packages"],
+ device => "tmpfs",
+ fstype => "tmpfs",
+ options => "noatime,defaults,size=512M",
+ pass => 0,
+ dump => 0,
+ ensure => mounted;
}
+
+ file {
+ "/usr/share/varnish/reload-vcl":
+ source => "puppet:///files/varnish/reload-vcl",
+ mode => 0555;
+ }
+}
+
+class varnish::common-vcl {
+ require "varnish::common"
- class common-vcl {
- require "varnish::common"
-
- file {
- "/etc/varnish/geoip.inc.vcl":
- content =>
template("varnish/geoip.inc.vcl.erb");
- "/etc/varnish/device-detection.inc.vcl":
- content =>
template("varnish/device-detection.inc.vcl.erb");
- "/etc/varnish/errorpage.inc.vcl":
- content =>
template("varnish/errorpage.inc.vcl.erb");
- }
+ file {
+ "/etc/varnish/geoip.inc.vcl":
+ content => template("varnish/geoip.inc.vcl.erb");
+ "/etc/varnish/device-detection.inc.vcl":
+ content =>
template("varnish/device-detection.inc.vcl.erb");
+ "/etc/varnish/errorpage.inc.vcl":
+ content => template("varnish/errorpage.inc.vcl.erb");
}
+}
- define extra-vcl {
- $vcl = regsubst($title, '^([^ ]+) .*$', '\1')
- $filename = "/etc/varnish/${vcl}.inc.vcl"
- if !defined(File[$filename]) {
- file { $filename:
- content =>
template("varnish/${vcl}.inc.vcl.erb"),
- mode => 0444;
- }
- }
- }
-
- define instance(
- $name="",
- $vcl = "",
- $extra_vcl = [],
- $port="80",
- $admin_port="6083",
- $storage="-s malloc,1G",
- $runtime_parameters=[],
- $backends=undef,
- $directors={},
- $director_type="hash",
- $director_options={},
- $vcl_config,
- $backend_options,
- $cluster_options={},
- $wikimedia_networks=[],
- $xff_sources=[]) {
-
- include varnish::common
-
- $runtime_params = join(prefix($runtime_parameters, "-p "), " ")
- if $name == "" {
- $instancesuffix = ""
- $extraopts = ""
- }
- else {
- $instancesuffix = "-${name}"
- $extraopts = "-n ${name}"
- }
-
- # Initialize variables for templates
- # FIXME: get rid of the $varnish_* below and update the
templates
- $varnish_port = $port
- $varnish_admin_port = $admin_port
- $varnish_storage = $storage
- $varnish_backends = $backends ? { undef =>
sort(unique(flatten(values($directors)))), default => $backends }
- $varnish_directors = $directors
- $varnish_backend_options = $backend_options
- # $cluster_option is referenced directly
-
- # Install VCL include files shared by all instances
- require "varnish::common-vcl"
-
- $extra_vcl_variable_to_make_puppet_parser_happy =
suffix($extra_vcl, " ${instancesuffix}")
- extra-vcl{ $extra_vcl_variable_to_make_puppet_parser_happy: }
-
- file {
- "/etc/init.d/varnish${instancesuffix}":
- content => template("varnish/varnish.init.erb"),
- mode => 0555;
- "/etc/default/varnish${instancesuffix}":
- content =>
template("varnish/varnish-default.erb"),
- mode => 0444;
- "/etc/varnish/${vcl}.inc.vcl":
- content =>
template("varnish/${vcl}.inc.vcl.erb"),
- notify =>
Exec["load-new-vcl-file${instancesuffix}"],
- mode => 0444;
- "/etc/varnish/wikimedia_${vcl}.vcl":
- require => File["/etc/varnish/${vcl}.inc.vcl"],
- content =>
template("varnish/wikimedia.vcl.erb"),
- mode => 0444;
- }
-
- service { "varnish${instancesuffix}":
- require => [
- File[
-
"/etc/default/varnish${instancesuffix}",
-
"/etc/init.d/varnish${instancesuffix}",
- "/etc/varnish/${vcl}.inc.vcl",
-
"/etc/varnish/wikimedia_${vcl}.vcl"
- ],
- Mount["/var/lib/varnish"]
- ],
- hasstatus => false,
- pattern => "/var/run/varnishd${instancesuffix}.pid",
- subscribe => Package[varnish],
- ensure => running;
- }
-
- exec { "load-new-vcl-file${instancesuffix}":
- require => [ Service["varnish${instancesuffix}"],
File["/etc/varnish/wikimedia_${vcl}.vcl"] ],
- subscribe => [File["/etc/varnish/wikimedia_${vcl}.vcl"],
- Class["varnish::common-vcl"],
- File[suffix(prefix($extra_vcl,
"/etc/varnish/"), ".inc.vcl")]
- ],
- command => "/usr/share/varnish/reload-vcl $extraopts",
- path => "/bin:/usr/bin",
- refreshonly => true;
- }
-
- monitor_service { "varnish http ${title}":
- description => "Varnish HTTP ${title}",
- check_command =>
"check_http_generic!varnishcheck!${port}"
- }
-
- # Restart gmond if this varnish instance has been (re)started
later
- # than gmond was started
- exec { "restart gmond for varnish${instancesuffix}":
- path => "/bin:/sbin:/usr/bin:/usr/sbin",
- command => "true",
- onlyif => "test /var/run/varnishd${instancesuffix}.pid
-nt /var/run/gmond.pid",
- notify => Service[gmond]
- }
- }
-
- class monitoring::ganglia($varnish_instances=['']) {
- $instances = join($varnish_instances, ",")
-
- file { "/usr/lib/ganglia/python_modules/varnish.py":
- require => File["/usr/lib/ganglia/python_modules"],
- source => "puppet:///files/ganglia/plugins/varnish.py";
- }
-
- exec {
- "generate varnish.pyconf":
- require =>
File["/usr/lib/ganglia/python_modules/varnish.py", "/etc/ganglia/conf.d"],
- command => "/usr/bin/python
/usr/lib/ganglia/python_modules/varnish.py \"$instances\" >
/etc/ganglia/conf.d/varnish.pyconf.new";
- "replace varnish.pyconf":
- cwd => "/etc/ganglia/conf.d",
- path => "/bin:/usr/bin",
- unless => "diff -q varnish.pyconf.new
varnish.pyconf && rm varnish.pyconf.new",
- command => "mv varnish.pyconf.new
varnish.pyconf",
- notify => Service[gmond];
- }
- Exec["generate varnish.pyconf"] -> Exec["replace
varnish.pyconf"]
- }
-
- define setup_filesystem() {
- file { "/srv/${title}":
- owner => root,
- group => root,
- ensure => directory
- }
-
- mount { "/srv/${title}":
- require => File["/srv/${title}"],
- device => "/dev/${title}",
- fstype => "auto",
- options => $::realm ? {
- 'production' =>
"noatime,nodiratime,nobarrier,logbufs=8",
- 'labs' =>
"noatime,nodiratime,nobarrier,comment=cloudconfig"
- },
- ensure => mounted
- }
- }
-
- class htcppurger($varnish_instances=["localhost:80"]) {
- Class[varnish::packages] -> Class[varnish::htcppurger]
-
- package { "vhtcpd":
- ensure => latest,
- }
-
- file { "/etc/default/vhtcpd":
- owner => root,
- group => root,
- mode => 0444,
- require => Package["vhtcpd"], # if we go first, we get
overwritten
- # TODO: -r ^upload\\.wikimedia\\.org\$ (POSIX ERE, new
param for class, quoting/escaping will be tricky...)
- # TODO: remove -F when VCL updated to match (no
hostname in PURGE URL)
- content => inline_template('DAEMON_OPTS="-F -m
239.128.0.112<% varnish_instances.each do |inst| -%> -c <%= inst %><% end
-%>"');
- }
-
- service { vhtcpd:
- require => Package["vhtcpd"],
- subscribe => File["/etc/default/vhtcpd"],
- hasstatus => true,
- hasrestart => true,
- ensure => running;
- }
-
- nrpe::monitor_service { "vhtcpd":
- description => "Varnish HTCP daemon",
- nrpe_command => "/usr/lib/nagios/plugins/check_procs -c
1:1 -u vhtcpd -a vhtcpd"
- }
- }
-
- class logging::config {
- file { "/etc/default/varnishncsa":
- source => "puppet:///files/varnish/varnishncsa.default",
- owner => root,
- group => root,
+define varnish::extra-vcl {
+ $vcl = regsubst($title, '^([^ ]+) .*$', '\1')
+ $filename = "/etc/varnish/${vcl}.inc.vcl"
+ if !defined(File[$filename]) {
+ file { $filename:
+ content => template("varnish/${vcl}.inc.vcl.erb"),
mode => 0444;
}
}
+}
- class logging::monitor {
- nrpe::monitor_service { "varnishncsa":
- description => "Varnish traffic logger",
- nrpe_command => "/usr/lib/nagios/plugins/check_procs -w
2:2 -c 2:4 -C varnishncsa"
- }
+define varnish::instance(
+ $name="",
+ $vcl = "",
+ $extra_vcl = [],
+ $port="80",
+ $admin_port="6083",
+ $storage="-s malloc,1G",
+ $runtime_parameters=[],
+ $backends=undef,
+ $directors={},
+ $director_type="hash",
+ $director_options={},
+ $vcl_config,
+ $backend_options,
+ $cluster_options={},
+ $wikimedia_networks=[],
+ $xff_sources=[]) {
+
+ include varnish::common
+
+ $runtime_params = join(prefix($runtime_parameters, "-p "), " ")
+ if $name == "" {
+ $instancesuffix = ""
+ $extraopts = ""
+ }
+ else {
+ $instancesuffix = "-${name}"
+ $extraopts = "-n ${name}"
}
- define logging($listener_address, $port="8420", $cli_args="",
$log_fmt=false, $instance_name="frontend", $monitor=true) {
- require varnish::packages,
- varnish::logging::config
- if $monitor {
- require varnish::logging::monitor
- }
+ # Initialize variables for templates
+ # FIXME: get rid of the $varnish_* below and update the templates
+ $varnish_port = $port
+ $varnish_admin_port = $admin_port
+ $varnish_storage = $storage
+ $varnish_backends = $backends ? { undef =>
sort(unique(flatten(values($directors)))), default => $backends }
+ $varnish_directors = $directors
+ $varnish_backend_options = $backend_options
+ # $cluster_option is referenced directly
- $varnishservice = $instance_name ? {
- "" => "varnish",
- default => "varnish-${instance_name}"
- }
+ # Install VCL include files shared by all instances
+ require "varnish::common-vcl"
- $shm_name = $instance_name ? {
- "" => $hostname,
- default => $instance_name
- }
+ $extra_vcl_variable_to_make_puppet_parser_happy = suffix($extra_vcl, "
${instancesuffix}")
+ extra-vcl{ $extra_vcl_variable_to_make_puppet_parser_happy: }
- file { "/etc/init.d/varnishncsa-${name}":
- content => template("varnish/varnishncsa.init.erb"),
- owner => root,
- group => root,
- mode => 0555,
- notify => Service["varnishncsa-${name}"];
- }
+ file {
+ "/etc/init.d/varnish${instancesuffix}":
+ content => template("varnish/varnish.init.erb"),
+ mode => 0555;
+ "/etc/default/varnish${instancesuffix}":
+ content => template("varnish/varnish-default.erb"),
+ mode => 0444;
+ "/etc/varnish/${vcl}.inc.vcl":
+ content => template("varnish/${vcl}.inc.vcl.erb"),
+ notify => Exec["load-new-vcl-file${instancesuffix}"],
+ mode => 0444;
+ "/etc/varnish/wikimedia_${vcl}.vcl":
+ require => File["/etc/varnish/${vcl}.inc.vcl"],
+ content => template("varnish/wikimedia.vcl.erb"),
+ mode => 0444;
+ }
- service { "varnishncsa-${name}":
- require => [ File["/etc/init.d/varnishncsa-${name}"],
Service[$varnishservice] ],
- subscribe => File["/etc/default/varnishncsa"],
- ensure => running,
- pattern =>
"/var/run/varnishncsa/varnishncsa-${name}.pid",
- hasstatus => false;
- }
+ service { "varnish${instancesuffix}":
+ require => [
+ File[
+ "/etc/default/varnish${instancesuffix}",
+ "/etc/init.d/varnish${instancesuffix}",
+ "/etc/varnish/${vcl}.inc.vcl",
+ "/etc/varnish/wikimedia_${vcl}.vcl"
+ ],
+ Mount["/var/lib/varnish"]
+ ],
+ hasstatus => false,
+ pattern => "/var/run/varnishd${instancesuffix}.pid",
+ subscribe => Package[varnish],
+ ensure => running;
+ }
+
+ exec { "load-new-vcl-file${instancesuffix}":
+ require => [ Service["varnish${instancesuffix}"],
File["/etc/varnish/wikimedia_${vcl}.vcl"] ],
+ subscribe => [File["/etc/varnish/wikimedia_${vcl}.vcl"],
+ Class["varnish::common-vcl"],
+ File[suffix(prefix($extra_vcl, "/etc/varnish/"),
".inc.vcl")]
+ ],
+ command => "/usr/share/varnish/reload-vcl $extraopts",
+ path => "/bin:/usr/bin",
+ refreshonly => true;
+ }
+
+ monitor_service { "varnish http ${title}":
+ description => "Varnish HTTP ${title}",
+ check_command => "check_http_generic!varnishcheck!${port}"
+ }
+
+ # Restart gmond if this varnish instance has been (re)started later
+ # than gmond was started
+ exec { "restart gmond for varnish${instancesuffix}":
+ path => "/bin:/sbin:/usr/bin:/usr/sbin",
+ command => "true",
+ onlyif => "test /var/run/varnishd${instancesuffix}.pid -nt
/var/run/gmond.pid",
+ notify => Service[gmond]
+ }
+}
+
+class varnish::monitoring::ganglia($varnish_instances=['']) {
+ $instances = join($varnish_instances, ",")
+
+ file { "/usr/lib/ganglia/python_modules/varnish.py":
+ require => File["/usr/lib/ganglia/python_modules"],
+ source => "puppet:///files/ganglia/plugins/varnish.py";
+ }
+
+ exec {
+ "generate varnish.pyconf":
+ require =>
File["/usr/lib/ganglia/python_modules/varnish.py", "/etc/ganglia/conf.d"],
+ command => "/usr/bin/python
/usr/lib/ganglia/python_modules/varnish.py \"$instances\" >
/etc/ganglia/conf.d/varnish.pyconf.new";
+ "replace varnish.pyconf":
+ cwd => "/etc/ganglia/conf.d",
+ path => "/bin:/usr/bin",
+ unless => "diff -q varnish.pyconf.new varnish.pyconf &&
rm varnish.pyconf.new",
+ command => "mv varnish.pyconf.new varnish.pyconf",
+ notify => Service[gmond];
+ }
+ Exec["generate varnish.pyconf"] -> Exec["replace varnish.pyconf"]
+}
+
+define varnish::setup_filesystem() {
+ file { "/srv/${title}":
+ owner => root,
+ group => root,
+ ensure => directory
+ }
+
+ mount { "/srv/${title}":
+ require => File["/srv/${title}"],
+ device => "/dev/${title}",
+ fstype => "auto",
+ options => $::realm ? {
+ 'production' =>
"noatime,nodiratime,nobarrier,logbufs=8",
+ 'labs' =>
"noatime,nodiratime,nobarrier,comment=cloudconfig"
+ },
+ ensure => mounted
+ }
+}
+
+class varnish::htcppurger($varnish_instances=["localhost:80"]) {
+ Class[varnish::packages] -> Class[varnish::htcppurger]
+
+ package { "vhtcpd":
+ ensure => latest,
+ }
+
+ file { "/etc/default/vhtcpd":
+ owner => root,
+ group => root,
+ mode => 0444,
+ require => Package["vhtcpd"], # if we go first, we get
overwritten
+ # TODO: -r ^upload\\.wikimedia\\.org\$ (POSIX ERE, new param
for class, quoting/escaping will be tricky...)
+ # TODO: remove -F when VCL updated to match (no hostname in
PURGE URL)
+ content => inline_template('DAEMON_OPTS="-F -m 239.128.0.112<%
varnish_instances.each do |inst| -%> -c <%= inst %><% end -%>"');
+ }
+
+ service { vhtcpd:
+ require => Package["vhtcpd"],
+ subscribe => File["/etc/default/vhtcpd"],
+ hasstatus => true,
+ hasrestart => true,
+ ensure => running;
+ }
+
+ nrpe::monitor_service { "vhtcpd":
+ description => "Varnish HTCP daemon",
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1:1 -u
vhtcpd -a vhtcpd"
+ }
+}
+
+class varnish::logging::config {
+ file { "/etc/default/varnishncsa":
+ source => "puppet:///files/varnish/varnishncsa.default",
+ owner => root,
+ group => root,
+ mode => 0444;
+ }
+}
+
+class varnish::logging::monitor {
+ nrpe::monitor_service { "varnishncsa":
+ description => "Varnish traffic logger",
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 2:2 -c
2:4 -C varnishncsa"
+ }
+}
+
+define varnish::logging($listener_address, $port="8420", $cli_args="",
$log_fmt=false, $instance_name="frontend", $monitor=true) {
+ require varnish::packages,
+ varnish::logging::config
+ if $monitor {
+ require varnish::logging::monitor
+ }
+
+ $varnishservice = $instance_name ? {
+ "" => "varnish",
+ default => "varnish-${instance_name}"
+ }
+
+ $shm_name = $instance_name ? {
+ "" => $hostname,
+ default => $instance_name
+ }
+
+ file { "/etc/init.d/varnishncsa-${name}":
+ content => template("varnish/varnishncsa.init.erb"),
+ owner => root,
+ group => root,
+ mode => 0555,
+ notify => Service["varnishncsa-${name}"];
+ }
+
+ service { "varnishncsa-${name}":
+ require => [ File["/etc/init.d/varnishncsa-${name}"],
Service[$varnishservice] ],
+ subscribe => File["/etc/default/varnishncsa"],
+ ensure => running,
+ pattern => "/var/run/varnishncsa/varnishncsa-${name}.pid",
+ hasstatus => false;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/68643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I803065b5ac9e4c7ddb84462922c0e4b3ba773613
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
