From f6fbcd82a9f34b9f2afd597ec80b5cf6ebaa85cb Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 13 Oct 2020 17:50:55 +0000
Subject: [PATCH] Switch to python3-apt in Victoria

The python-apt binary package is removed in Ubuntu Groovy.
Switch the charm to python3-apt.

Change-Id: Ib3da731b3e649bf99d63229c376eb8c8354a72d7
Closes-Bug: #1899680
---
 src/lib/charm/openstack/barbican.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/lib/charm/openstack/barbican.py b/src/lib/charm/openstack/barbican.py
index fe1027a..322c8bb 100644
--- a/src/lib/charm/openstack/barbican.py
+++ b/src/lib/charm/openstack/barbican.py
@@ -30,6 +30,11 @@ PACKAGES = [
     'python3-barbican', 'libapache2-mod-wsgi-py3',
     'python-apt',  # NOTE: workaround for hacluster suboridinate
 ]
+PACKAGES_VICTORIA = [
+    'barbican-common', 'barbican-api', 'barbican-worker',
+    'python3-barbican', 'libapache2-mod-wsgi-py3',
+    'python3-apt',  # NOTE: workaround for hacluster suboridinate
+]
 BARBICAN_DIR = '/etc/barbican/'
 BARBICAN_CONF = BARBICAN_DIR + "barbican.conf"
 BARBICAN_API_PASTE_CONF = BARBICAN_DIR + "barbican-api-paste.ini"
@@ -237,3 +242,10 @@ class BarbicanCharm(charms_openstack.charm.HAOpenStackCharm):
             required_relations.append('hsm')
         return super(BarbicanCharm, self).states_to_check(
             required_relations=required_relations)
+
+
+class BarbicanCharmVictoria(BarbicanCharm):
+
+    release = 'victoria'
+
+    packages = PACKAGES_VICTORIA