From 666fe9e988a2176d097092cffb4df92e635e4a25 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Wed, 24 Apr 2019 09:21:05 +0200 Subject: [PATCH] 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 juju-solutions/layer-basic#135 Change-Id: I129ca4506e44abc1e062d5545ff52f992f86a3b9 --- src/layer.yaml | 1 - src/wheelhouse.txt | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/wheelhouse.txt diff --git a/src/layer.yaml b/src/layer.yaml index 68e3b5f..cc2e549 100644 --- a/src/layer.yaml +++ b/src/layer.yaml @@ -6,5 +6,4 @@ includes: options: basic: use_venv: True - include_system_packages: True repo: https://github.com/openstack/charm-ceph-rbd-mirror diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt new file mode 100644 index 0000000..17c1230 --- /dev/null +++ b/src/wheelhouse.txt @@ -0,0 +1,3 @@ + +jinja2 +psutil