Launchpad Mojo Specs

Merge ~sajoupa/launchpad-mojo-specs:ps5 into launchpad-mojo-specs:master

  1. Git
  2. lp:~sajoupa/launchpad-mojo-specs
  3. ps5
  4. Merge into master
Proposed by Laurent Sesquès
Status: Merged
Merged at revision: 8537a12f79759e9a56421ac15a99538e96700786
Proposed branch: ~sajoupa/launchpad-mojo-specs:ps5
Merge into: launchpad-mojo-specs:master
Diff against target: 21 lines (+2/-1)
1 file modified
lp-webhooks-proxy/bundle.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+407887@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lp-webhooks-proxy/bundle.yaml b/lp-webhooks-proxy/bundle.yaml
2index d2bcd20..3ff0e1b 100644
3--- a/lp-webhooks-proxy/bundle.yaml
4+++ b/lp-webhooks-proxy/bundle.yaml
5@@ -12,7 +12,7 @@
6 {%- if stage_name == "production" %}
7 {%- set nagios_context = "lp-prodstack-webhooks-proxy" %}
8 {%- set nagios_hostgroups = "prodstack-lp" %}
9-{%- set nagios_master = "wekufe.canonical.com" %}
10+{%- set nagios_master = "wekufe.canonical.com,nagios.ps5.internal" %}
11 {#- localhost, ackee, loganberry #}
12 {%- set trusted_hosts = "127.0.0.0/8, 91.189.89.26, 91.189.90.37" %}
13 {%- elif stage_name == "staging" %}
14@@ -142,6 +142,7 @@ applications:
15 nrpe:
16 charm: cs:nrpe-73
17 options:
18+ export_nagios_definitions: true
19 hostgroups: {{ nagios_hostgroups }}
20 nagios_host_context: {{ nagios_context }}
21 nagios_master: {{ nagios_master }}

Subscribers

People subscribed via source and target branches