Merge ~afreiberger/charm-openstack-service-checks/+git/charm-openstack-service-checks:lp1818113 into ~canonical-bootstack/charm-openstack-service-checks:master

[Drew Freiberger]

Resolved race condition with keystoneauth1 module import

    Using layer:basic imports apt packages during bootstrap before
    any reactive handlers are called. removed layer:apt

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

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

[Alvaro Uria (aluria)]

lgtm

review: Approve

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

Change successfully merged at revision 11f2a702444d5b45c84a667a69db11011dbdc88b

diff --git a/layer.yaml b/layer.yaml
index 72f0af5..92676ed 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,5 +1,4 @@
 includes:
-  - 'layer:apt'
   - 'layer:basic'
   - 'interface:keystone-credentials'
   - 'interface:nrpe-external-master'
@@ -8,7 +7,6 @@ repo: 'lp:~canonical-bootstack/+git/charm-openstack-service-checks'
 options:
   basic:
     use_venv: true
-  apt:
     packages:
       - nagios-nrpe-server
       - python3-keystoneclient
diff --git a/reactive/service_checks.py b/reactive/service_checks.py
index 9805f77..5355c6f 100644
--- a/reactive/service_checks.py
+++ b/reactive/service_checks.py
@@ -28,7 +28,7 @@ PLUGINS_DIR = '/usr/local/lib/nagios/plugins/'
 
 @when_not('os-service-checks.installed')
 def install_service_checks():
-    # Apt package installs are handled by the apt layer
+    # Apt package installs are handled by the basic layer
     set_state('os-service-checks.installed')
     remove_state('os-service-checks.configured')
     hookenv.status_set('active', 'Ready')