From 75bda77ab6af1859db545c7f19c22171648beac5 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Wed, 24 Apr 2019 09:31:02 +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

Fix charm locations in functional test bundles.

Change-Id: I7ad4b548669989f778c604addb1aa873f958a5f9
---
 src/layer.yaml                                           | 1 -
 src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml | 8 ++++----
 src/tests/bundles/bionic-rocky-pacemaker-remote.yaml     | 8 ++++----
 src/tests/bundles/bionic-rocky.yaml                      | 6 +++---
 src/wheelhouse.txt                                       | 3 +++
 5 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 src/wheelhouse.txt

diff --git a/src/layer.yaml b/src/layer.yaml
index b13c275..49759dd 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -2,4 +2,3 @@ includes: ['layer:openstack', 'interface:keystone-credentials']
 options:
   basic:
     use_venv: True
-    include_system_packages: True
diff --git a/src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml b/src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml
index e96cfd5..3f27400 100644
--- a/src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml
+++ b/src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml
@@ -104,7 +104,7 @@ applications:
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~gnuoy/keystone-36
+    charm: cs:~openstack-charmers-next/keystone
     series: bionic
     num_units: 1
     options:
@@ -160,7 +160,7 @@ applications:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
   masakari:
-    charm: cs:~gnuoy/masakari-4
+    charm: cs:~openstack-charmers-next/masakari
     series: bionic
     num_units: 3
     options:
@@ -183,12 +183,12 @@ applications:
     charm: masakari-monitors
     series: bionic
   hacluster:
-    charm: cs:~gnuoy/hacluster-28
+    charm: cs:~openstack-charmers-next/hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
   pacemaker-remote:
-    charm: cs:~gnuoy/pacemaker-remote-8
+    charm: cs:~openstack-charmers-next/pacemaker-remote
     options:
       enable-stonith: False
       enable-resources: False
diff --git a/src/tests/bundles/bionic-rocky-pacemaker-remote.yaml b/src/tests/bundles/bionic-rocky-pacemaker-remote.yaml
index 2c8bec2..5bfaf43 100644
--- a/src/tests/bundles/bionic-rocky-pacemaker-remote.yaml
+++ b/src/tests/bundles/bionic-rocky-pacemaker-remote.yaml
@@ -90,7 +90,7 @@ applications:
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~gnuoy/keystone-36
+    charm: cs:~openstack-charmers-next/keystone
     series: bionic
     num_units: 1
     options:
@@ -146,7 +146,7 @@ applications:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
   masakari:
-    charm: cs:~gnuoy/masakari-4
+    charm: cs:~openstack-charmers-next/masakari
     series: bionic
     num_units: 3
     options:
@@ -169,12 +169,12 @@ applications:
     charm: masakari-monitors
     series: bionic
   hacluster:
-    charm: cs:~gnuoy/hacluster-17
+    charm: cs:~openstack-charmers-next/hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
   pacemaker-remote:
-    charm: cs:~gnuoy/pacemaker-remote-7
+    charm: cs:~openstack-charmers-next/pacemaker-remote
     options:
       enable-stonith: False
       enable-resources: False
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
index 1d52353..234d1d1 100644
--- a/src/tests/bundles/bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@@ -86,7 +86,7 @@ applications:
       block-device: "None"
       glance-api-version: 2
   keystone:
-    charm: cs:~gnuoy/keystone-36
+    charm: cs:~openstack-charmers-next/keystone
     series: bionic
     num_units: 1
     options:
@@ -142,7 +142,7 @@ applications:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
   masakari:
-    charm: cs:~gnuoy/masakari-2
+    charm: cs:~openstack-charmers-next/masakari
     series: bionic
     num_units: 1
     options:
@@ -164,7 +164,7 @@ applications:
     charm: masakari-monitors
     series: bionic
   hacluster:
-    charm: cs:~gnuoy/hacluster-7
+    charm: cs:~openstack-charmers-next/hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
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