Distribute direct charm dependencies

Do not rely on system installed Python packages but distribute the direct charm dependencies as part of the charms wheelhouse. As the span of distributions we need to support with reactive charms widens we will run into compability problems with the current model. For further reference see juju/charm-helpers#341 and canonical/layer-basic#135 Change-Id: Ic89bbc395d970039e5da4fe131b0feab9ed0f0a2
openstack · Aug 15, 2019 · 46adde8 · 46adde8
1 parent 25632d4
commit 46adde8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/layer.yaml b/src/layer.yaml
@@ -8,7 +8,6 @@ includes:
 options:
   basic:
     use_venv: True
-    include_system_packages: True
     packages: [ 'libffi-dev', 'libssl-dev' ]
   snap:
     octavia-diskimage-retrofit:

diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
@@ -4,11 +4,8 @@ smoke_bundles:
 gate_bundles:
 - bionic-stein
 - bionic-rocky
-comment: |
-  Deployment on Disco and onwards will not work until we resolve
-  https://bugs.launchpad.net/bugs/1824112
-dev_bundles:
 - disco
+dev_bundles:
 - eoan
 target_deploy_status:
   glance-simplestreams-sync:

diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
@@ -1,2 +1,5 @@
 keystoneauth1
 python-glanceclient
+
+jinja2
+psutil