Merge ~aluria/charm-openstack-service-checks/+git/charm-openstack-service-checks:bug/1875627 into ~llama-charmers/charm-openstack-service-checks:master

[Alvaro Uria]

[Alvaro Uria (aluria)]

This MP limits the use to python3 packages. keystoneauth1 is imported in a lib used by the reactive script, and needs to be installed by layer-basic. For such reason, default python3 modules (keystoneclient, openstackclient) are also installed via layer-basic.

With regard to python3-octaviaclient, it is installed only if Octavia is supported (from bionic onwards and if the Juju config parameter is enabled).

Finally, support on focal has also been tested as is, and since it works as expected it has been included in this MP.

* lint: commands succeeded
* unit: 15 passed, 17 warnings in 1.24s
* func: 22 passed, 10804 warnings in 1166.94s (0:19:26)

[Wouter van Bommel (woutervb)]

lgtm

review: Approve

[Jeremy Lounder (jldev)]

review: Approve

diff --git a/layer.yaml b/layer.yaml
index 0606d45..2ba89c2 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -10,18 +10,15 @@ includes:
   - 'interface:keystone-notifications'
   - 'interface:nrpe-external-master'
 ignore: ['.*.swp' ]
-repo: 'lp:~canonical-bootstack/+git/charm-openstack-service-checks'
+repo: 'lp:charm-openstack-service-checks'
 options:
   basic:
     use_venv: true
     include_system_packages: true
     packages:
-      - nagios-nrpe-server
+      - python3-keystoneauth1
       - python3-keystoneclient
       - python3-openstackclient
-      - python-openstackclient
-      - python3-octaviaclient
-      - python-octaviaclient
   snap:
     fcbtest:
       channel: stable
diff --git a/lib/lib_openstack_service_checks.py b/lib/lib_openstack_service_checks.py
index 3ec61b1..25607d9 100644
--- a/lib/lib_openstack_service_checks.py
+++ b/lib/lib_openstack_service_checks.py
@@ -8,6 +8,7 @@ from urllib.parse import urlparse
 
 import configparser
 
+from charmhelpers import fetch
 from charmhelpers.core.templating import render
 from charmhelpers.contrib.openstack.utils import config_flags_parser
 from charmhelpers.core import hookenv, host, unitdata
@@ -201,6 +202,7 @@ class OSCHelper():
         # only care about octavia after 18.04
         if host.lsb_release()['DISTRIB_RELEASE'] >= '18.04':
             if self.is_octavia_check_enabled:
+                fetch.apt_install(["python3-octaviaclient"], fatal=True)
                 script = os.path.join(self.plugins_dir, 'check_octavia.py')
 
                 for check in ('loadbalancers', 'amphorae', 'pools'):
diff --git a/metadata.yaml b/metadata.yaml
index 94a7db8..eaf778e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -8,6 +8,7 @@ tags:
   - ops
   - monitoring
 series:
+- focal
 - bionic
 - xenial
 - trusty
diff --git a/tests/functional/test_deploy.py b/tests/functional/test_deploy.py
index 9ddc19c..163f130 100644
--- a/tests/functional/test_deploy.py
+++ b/tests/functional/test_deploy.py
@@ -8,7 +8,9 @@ pytestmark = pytest.mark.asyncio
 
 SERIES = [
     'xenial',
-    'bionic']
+    'bionic',
+    'focal',
+]
 CHARM_BUILD_DIR = os.getenv('CHARM_BUILD_DIR', '.').rstrip('/')