Launchpad Mojo Specs

Merge ~hloeung/launchpad-mojo-specs:lp-git into launchpad-mojo-specs:master

  1. Git
  2. lp:~hloeung/launchpad-mojo-specs
  3. lp-git
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Merged at revision: 8c9afb244615ecbaf1780c8510c484fb8aa0fbd6
Proposed branch: ~hloeung/launchpad-mojo-specs:lp-git
Merge into: launchpad-mojo-specs:master
Diff against target: 21 lines (+2/-1)
1 file modified
lp-git/bundle.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Colin Misare Approve
Review via email: mp+438724@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Misare (cmisare) wrote :

LGTM

review: Approve
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-git/bundle.yaml b/lp-git/bundle.yaml
2index 7092214..b45db64 100644
3--- a/lp-git/bundle.yaml
4+++ b/lp-git/bundle.yaml
5@@ -14,14 +14,15 @@
6 {%- set devel = False %}
7 {%- set log_hosts_allow = "carob.canonical.com" %}
8 {%- set main_site_root = "https://launchpad.net/" %}
9-{%- set monitoring_allowed_cidr = "127.0.0.1/32 10.172.0.0/16" %}
10 {%- set nagios_context = "lp-prodstack-git" %}
11 {%- set nagios_e2e_urls_git = "git://git.launchpad.net/launchpad" %}
12 {%- set nagios_e2e_urls_http = "https://git.launchpad.net/launchpad" %}
13 {%- set nagios_hostgroups = "prodstack-lp" %}
14 {%- if stage_name == "production-ps5" %}
15+{%- set monitoring_allowed_cidr = "127.0.0.1/32 10.172.0.0/16 10.131.35.0/24" %}
16 {%- set nagios_master = "nagios.ps5.internal" %}
17 {%- else %}
18+{%- set monitoring_allowed_cidr = "127.0.0.1/32 10.172.0.0/16" %}
19 {%- set nagios_master = "wekufe.canonical.com" %}
20 {%- endif %}
21 {%- set openid_provider_root = "https://login.launchpad.net/" %}

Subscribers

People subscribed via source and target branches