← Back to branch summary

~hloeung/mojo/mojo-specs-manifest-initial-skip-checks

« back to all changes in this revision

Viewing changes to charm-testing/canonical-livepatch/deploy

  • Committer: mergebot at canonical
  • Author(s): "Haw Loeung"
  • Date: 2020-10-02 00:00:19 UTC
  • mfrom: (163.1.3 mojo-specs)
  • Revision ID: mergebot@juju-139df4-prod-is-toolbox-0.canonical.com-20201002000019-717watknijq4az0h
Fixed setting nagios_master as required

Latest changes in the nrpe charm (316db7ce / LP:1887106) now requires either nagios_master set or an external monitor relation. This causes CI to fail and eventually time out as it's stuck with the nrpe unit in 'blocked' state.

Reviewed-on: https://code.launchpad.net/~hloeung/mojo/mojo-specs-nrpe-nagios-master/+merge/391680
Reviewed-by: Alexandre Gomes <alexandre.gomes@canonical.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
charm-testing/canonical-livepatch/deploy
9
9
                livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key
10
10
        nrpe:
11
11
            charm: nrpe
 
12
            options:
 
13
                nagios_master: nagios1.internal
12
14
{%- if series != "trusty" %}
13
 
            options:
14
15
                procs: '-w 200 -c 250 -k'
15
16
                swap: '-w 90% -c 75% -n ok'
16
17
{%- endif %}