Merge lp:~mthaddon/mojo/trusty-series-if into lp:mojo/mojo-specs

Proposed by Tom Haddon
Status: Merged
Approved by: Laurent Sesques
Approved revision: 117
Merged at revision: 117
Proposed branch: lp:~mthaddon/mojo/trusty-series-if
Merge into: lp:mojo/mojo-specs
Diff against target: 83 lines (+9/-9)
5 files modified
charm-testing/memcached/deploy (+1/-1)
charm-testing/postgresql/deploy (+2/-2)
charm-testing/prometheus2/deploy (+2/-2)
charm-testing/squid-reverseproxy/deploy (+2/-2)
charm-testing/telegraf/deploy (+2/-2)
To merge this branch: bzr merge lp:~mthaddon/mojo/trusty-series-if
Reviewer Review Type Date Requested Status
Laurent Sesques Approve
Review via email: mp+349643@code.launchpad.net

Commit message

charm-testing: use if series not trusty templating consistently

Description of the change

charm-testing: use if series not trusty templating consistently

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Laurent Sesques (sajoupa) :
review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 117

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/memcached/deploy'
2--- charm-testing/memcached/deploy 2018-07-09 04:24:22 +0000
3+++ charm-testing/memcached/deploy 2018-07-16 12:29:19 +0000
4@@ -6,7 +6,7 @@
5 num_units: 3
6 nrpe:
7 charm: nrpe
8-{%- if series != "trusty" -%}
9+{%- if series != "trusty" %}
10 options:
11 procs: '-w 200 -c 250 -k'
12 swap: '-w 90% -c 75% -n ok'
13
14=== modified file 'charm-testing/postgresql/deploy'
15--- charm-testing/postgresql/deploy 2018-07-09 04:24:22 +0000
16+++ charm-testing/postgresql/deploy 2018-07-16 12:29:19 +0000
17@@ -5,10 +5,10 @@
18 charm: postgresql
19 nrpe:
20 charm: nrpe
21-{% if series != "trusty" -%}
22+{%- if series != "trusty" %}
23 options:
24 procs: '-w 200 -c 250 -k'
25 swap: '-w 90% -c 75% -n ok'
26-{% endif -%}
27+{%- endif %}
28 relations:
29 - ["postgresql", "nrpe:nrpe-external-master"]
30
31=== modified file 'charm-testing/prometheus2/deploy'
32--- charm-testing/prometheus2/deploy 2018-07-09 04:24:22 +0000
33+++ charm-testing/prometheus2/deploy 2018-07-16 12:29:19 +0000
34@@ -63,11 +63,11 @@
35 skip_serial_number: true
36 nrpe:
37 charm: nrpe
38-{% if series != "trusty" -%}
39+{%- if series != "trusty" %}
40 options:
41 procs: '-w 200 -c 250 -k'
42 swap: '-w 90% -c 75% -n ok'
43-{% endif -%}
44+{%- endif %}
45 relations:
46 - ["telegraf:juju-info", "prometheus2:juju-info"]
47 - ["telegraf:juju-info", "prometheus-pushgateway"]
48
49=== modified file 'charm-testing/squid-reverseproxy/deploy'
50--- charm-testing/squid-reverseproxy/deploy 2018-07-09 04:24:22 +0000
51+++ charm-testing/squid-reverseproxy/deploy 2018-07-16 12:29:19 +0000
52@@ -10,11 +10,11 @@
53 charm: apache2
54 nrpe:
55 charm: nrpe
56-{% if series != "trusty" -%}
57+{%- if series != "trusty" %}
58 options:
59 procs: '-w 200 -c 250 -k'
60 swap: '-w 90% -c 75% -n ok'
61-{% endif -%}
62+{%- endif %}
63 relations:
64 - ['squid-reverseproxy', 'nrpe:nrpe-external-master']
65 - ['apache2', 'nrpe:nrpe-external-master']
66
67=== modified file 'charm-testing/telegraf/deploy'
68--- charm-testing/telegraf/deploy 2018-07-09 04:24:22 +0000
69+++ charm-testing/telegraf/deploy 2018-07-16 12:29:19 +0000
70@@ -8,11 +8,11 @@
71 expose: true
72 nrpe:
73 charm: nrpe
74-{% if series != "trusty" -%}
75+{%- if series != "trusty" %}
76 options:
77 procs: '-w 200 -c 250 -k'
78 swap: '-w 90% -c 75% -n ok'
79-{% endif -%}
80+{%- endif %}
81 relations:
82 - ["ubuntu:juju-info", "nrpe:general-info"]
83 - ["ubuntu:juju-info", "telegraf:juju-info"]

Subscribers

People subscribed via source and target branches

to all changes: