Merge lp:~mthaddon/mojo/elasticsearch-default-series into lp:mojo/mojo-specs

[Tom Haddon]

charm-testing/filebeat: switch elasticsearch to default series since it supports xenial and bionic now

charm-testing/filebeat: switch elasticsearch to default series since it supports xenial and bionic now

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Junien F (axino)]

+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 158

=== modified file 'charm-testing/filebeat/deploy'
--- charm-testing/filebeat/deploy	2018-07-09 04:24:22 +0000
+++ charm-testing/filebeat/deploy	2020-02-21 08:53:21 +0000
@@ -9,14 +9,10 @@
                 install_sources: 'deb http://archive.admin.canonical.com/other/packages.elastic.co stable main'
         elasticsearch:
             charm: elasticsearch
-            series: trusty
             num_units: 2
             options:
                 apt-key-url: 'http://archive.admin.canonical.com/other/artifacts.elastic.co/GPG-KEY-elasticsearch'
                 apt-repository: 'deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main'
-        nrpe-trusty:
-            charm: nrpe
-            series: trusty
         nrpe:
             charm: nrpe
 {%- if series != "trusty" %}
@@ -28,4 +24,4 @@
         - ['ubuntu', 'filebeat']
         - ['filebeat:elasticsearch', 'elasticsearch:client']
         - ['nrpe', 'ubuntu']
-        - ['nrpe-trusty', 'elasticsearch']
+        - ['nrpe', 'elasticsearch']

=== removed file 'charm-testing/filebeat/pre-deploy'