Merge lp:~paulgear/mojo/mojo-specs into lp:mojo/mojo-specs

Proposed by Paul Gear
Status: Merged
Approved by: Haw Loeung
Approved revision: no longer in the source branch.
Merged at revision: 111
Proposed branch: lp:~paulgear/mojo/mojo-specs
Merge into: lp:mojo/mojo-specs
Diff against target: 36 lines (+26/-0)
2 files modified
charm-testing/ntp/collect (+4/-0)
charm-testing/ntp/deploy (+22/-0)
To merge this branch: bzr merge lp:~paulgear/mojo/mojo-specs
Reviewer Review Type Date Requested Status
Haw Loeung Approve
Review via email: mp+349103@code.launchpad.net

Commit message

Add charm-testing/ntp stage

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

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

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM, +1

review: Approve
lp:~paulgear/mojo/mojo-specs updated
111. By Paul Gear

Add charm-testing/ntp stage

Reviewed-on: https://code.launchpad.net/~paulgear/mojo/mojo-specs/+merge/349103
Reviewed-by: Haw Loeung <email address hidden>

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 111

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'charm-testing/ntp'
2=== added file 'charm-testing/ntp/collect'
3--- charm-testing/ntp/collect 1970-01-01 00:00:00 +0000
4+++ charm-testing/ntp/collect 2018-07-09 03:10:15 +0000
5@@ -0,0 +1,4 @@
6+ubuntu cs:ubuntu
7+nrpe cs:nrpe
8+ntp cs:ntp
9+telegraf cs:telegraf
10
11=== added file 'charm-testing/ntp/deploy'
12--- charm-testing/ntp/deploy 1970-01-01 00:00:00 +0000
13+++ charm-testing/ntp/deploy 2018-07-09 03:10:15 +0000
14@@ -0,0 +1,22 @@
15+ubuntu:
16+ series: {{series}}
17+ services:
18+ ubuntu:
19+ charm: ubuntu
20+ num_units: 5
21+ nrpe:
22+ charm: nrpe
23+ {% if series == "xenial" %}options:
24+ procs: '-w 200 -c 250'
25+ swap: '-w 90% -c 75% -n ok'{% endif %}
26+ ntp:
27+ charm: ntp
28+ options:
29+ auto_peers: true
30+ telegraf:
31+ charm: telegraf
32+ relations:
33+ - ['ubuntu', 'nrpe']
34+ - ['ubuntu', 'ntp']
35+ - ['ubuntu', 'telegraf']
36+ - ['ntp', 'nrpe']

Subscribers

People subscribed via source and target branches

to all changes: