← Back to branch summary

~tcuthbert/mojo/mojo-specs-wp-k8s

« back to all changes in this revision

Viewing changes to charm-testing/filebeat/deploy

  • Committer: mergebot at canonical
  • Author(s): "Tom Haddon"
  • Date: 2020-02-21 09:01:50 UTC
  • mfrom: (157.1.1 elasticsearch-default-series)
  • Revision ID: mergebot@juju-139df4-prod-is-toolbox-0.canonical.com-20200221090150-9mp5mfvcezzm04ch
charm-testing/filebeat: switch elasticsearch to default series since it supports xenial and bionic now



Reviewed-on: https://code.launchpad.net/~mthaddon/mojo/elasticsearch-default-series/+merge/379611
Reviewed-by: Junien Fridrick <junien.fridrick@canonical.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
charm-testing/filebeat/deploy
9
9
                install_sources: 'deb http://archive.admin.canonical.com/other/packages.elastic.co stable main'
10
10
        elasticsearch:
11
11
            charm: elasticsearch
12
 
            series: trusty
13
12
            num_units: 2
14
13
            options:
15
14
                apt-key-url: 'http://archive.admin.canonical.com/other/artifacts.elastic.co/GPG-KEY-elasticsearch'
16
15
                apt-repository: 'deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main'
17
 
        nrpe-trusty:
18
 
            charm: nrpe
19
 
            series: trusty
20
16
        nrpe:
21
17
            charm: nrpe
22
18
{%- if series != "trusty" %}
28
24
        - ['ubuntu', 'filebeat']
29
25
        - ['filebeat:elasticsearch', 'elasticsearch:client']
30
26
        - ['nrpe', 'ubuntu']
31
 
        - ['nrpe-trusty', 'elasticsearch']
 
27
        - ['nrpe', 'elasticsearch']