Mark Bergsma has submitted this change and it was merged.
Change subject: Link IPv6 HTTPS LVS checks to the IPv6 host
......................................................................
Link IPv6 HTTPS LVS checks to the IPv6 host
Change-Id: Iba0a77e0f949f0ff174dce129a0a561d58577c2f
---
M manifests/lvs.pp
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 50c598e..eae9387 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -1022,7 +1022,12 @@
define monitor_service_lvs_http_https ( $ip_address, $uri, $critical="true",
$contact_group="admins" ) {
# Virtual resource for the monitoring host
- @monitor_host { $title: ip_address => $ip_address, group => "lvs",
critical => "true", contact_group => $contact_group }
+ @monitor_host { $title:
+ ip_address => $ip_address,
+ group => "lvs",
+ critical => "true",
+ contact_group => $contact_group
+ }
@monitor_service { $title:
host => $title,
@@ -1043,7 +1048,11 @@
define monitor_service_lvs6_http_https ( $ip_address, $uri, $critical="true" )
{
# Virtual resource for the monitoring host
- @monitor_host { "${title}_ipv6": ip_address => $ip_address, group =>
"lvs", critical => "true" }
+ @monitor_host { "${title}_ipv6":
+ ip_address => $ip_address,
+ group => "lvs",
+ critical => "true"
+ }
@monitor_service { "${title}_ipv6":
host => "${title}_ipv6",
@@ -1054,7 +1063,7 @@
}
@monitor_service { "${title}_ipv6_https":
- host => $title,
+ host => "${title}_ipv6",
group => "lvs",
description => "LVS HTTPS IPv6",
check_command => "check_https_url!${uri}",
--
To view, visit https://gerrit.wikimedia.org/r/90304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba0a77e0f949f0ff174dce129a0a561d58577c2f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
