Merge ~esunar/charm-nrpe:fix-functional-tests-bseng-1095 into charm-nrpe:master

[Erhan Sunar]

Fix for bseng-1095

Adding storage support to ubuntu charm prevented
deployment of ubuntu charm on lxd. Thus it is reverted
to revision 21 to be able to run functional tests.

Related issue:
  https://github.com/juju-solutions/charm-ubuntu/issues/48

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

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:7d6ef60b4854d98360544dc57f91fb8cde299389
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/23/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/670/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/226/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/23//rebuild

review: Approve (continuous-integration)

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

Failed to merge change (no changes to merge), setting status to needs review.

[Robert Gildein (rgildein)]

LGTM

review: Approve

diff --git a/tests/functional/tests/bundles/base.yaml b/tests/functional/tests/bundles/base.yaml
index c01fa2e..c8983d8 100644
--- a/tests/functional/tests/bundles/base.yaml
+++ b/tests/functional/tests/bundles/base.yaml
@@ -6,6 +6,9 @@ applications:
     constraints: root-disk=8G cores=2
   container:
     charm: ch:ubuntu
+    # temporary fix for https://github.com/juju-solutions/charm-ubuntu/issues/48
+    revision: 21
+    channel: stable
     num_units: 1
     to: ["lxd:rabbitmq-server/0"]
   nagios: