Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Properly align indentation of =>
......................................................................
Properly align indentation of =>
Change-Id: I8dc5216e22dfe3a496383a4953b395d60edce7ea
---
M modules/lvs/manifests/init.pp
M modules/solr/manifests/init.pp
2 files changed, 31 insertions(+), 31 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/init.pp b/modules/lvs/manifests/init.pp
index 287fddf..40e942b 100644
--- a/modules/lvs/manifests/init.pp
+++ b/modules/lvs/manifests/init.pp
@@ -22,26 +22,26 @@
define lvs::monitor_service_http_https ( $ip_address, $uri, $critical="true",
$contact_group="admins" ) {
# Virtual resource for the monitoring host
@monitoring::host { $title:
- ip_address => $ip_address,
- group => "lvs",
- critical => "true",
+ ip_address => $ip_address,
+ group => "lvs",
+ critical => "true",
contact_group => $contact_group
}
@monitoring::service { $title:
- host => $title,
- group => "lvs",
- description => "LVS HTTP IPv4",
+ host => $title,
+ group => "lvs",
+ description => "LVS HTTP IPv4",
check_command => "check_http_lvs!${uri}",
- critical => $critical
+ critical => $critical
}
@monitoring::service { "${title}_https":
- host => $title,
- group => "lvs",
- description => "LVS HTTPS IPv4",
+ host => $title,
+ group => "lvs",
+ description => "LVS HTTPS IPv4",
check_command => "check_https_url!${uri}",
- critical => $critical
+ critical => $critical
}
}
@@ -49,23 +49,23 @@
# Virtual resource for the monitoring host
@monitoring::host { "${title}_ipv6":
ip_address => $ip_address,
- group => "lvs",
- critical => "true"
+ group => "lvs",
+ critical => "true"
}
@monitoring::service { "${title}_ipv6":
- host => "${title}_ipv6",
- group => "lvs",
- description => "LVS HTTP IPv6",
+ host => "${title}_ipv6",
+ group => "lvs",
+ description => "LVS HTTP IPv6",
check_command => "check_http_lvs!${uri}",
- critical => $critical
+ critical => $critical
}
@monitoring::service { "${title}_ipv6_https":
- host => "${title}_ipv6",
- group => "lvs",
- description => "LVS HTTPS IPv6",
+ host => "${title}_ipv6",
+ group => "lvs",
+ description => "LVS HTTPS IPv6",
check_command => "check_https_url!${uri}",
- critical => $critical
+ critical => $critical
}
}
diff --git a/modules/solr/manifests/init.pp b/modules/solr/manifests/init.pp
index 85f3495..434b4a5 100644
--- a/modules/solr/manifests/init.pp
+++ b/modules/solr/manifests/init.pp
@@ -28,9 +28,9 @@
class solr::config ( $schema = undef, $replication_master = undef, $max_heap =
undef ) {
File {
- owner => 'jetty',
- group => 'root',
- mode => '0644',
+ owner => 'jetty',
+ group => 'root',
+ mode => '0644',
require => Class["solr::install"],
notify => Class["solr::service"],
}
@@ -38,7 +38,7 @@
file {
"/etc/default/jetty":
ensure => present,
- content => template("solr/jetty.erb"),
+ content => template("solr/jetty.erb"),
owner => 'root';
"/etc/solr/conf/solrconfig.xml":
ensure => present,
@@ -71,10 +71,10 @@
cron { "delete-old-jetty-logs":
command => "find /var/log/jetty/* -mtime +7 -delete",
- user => "root",
- hour => 0,
- minute => 0,
- ensure => present,
+ user => "root",
+ hour => 0,
+ minute => 0,
+ ensure => present,
}
}
@@ -83,8 +83,8 @@
solr::service
class { "solr::config":
- schema => $schema,
+ schema => $schema,
replication_master => $replication_master,
- max_heap => $max_heap
+ max_heap => $max_heap
}
}
--
To view, visit https://gerrit.wikimedia.org/r/181381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8dc5216e22dfe3a496383a4953b395d60edce7ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
