From b4644b6ade3df5a4a8b45ab9fbcb8f430c5d1ac8 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Fri, 1 Apr 2022 11:19:45 +0200 Subject: [PATCH] Use Netplan to configure SR-IOV and HWOL Rebuild pulls in updates to layer-ovn which enables use of Netplan to configure SR-IOV and Hardware Offload. Also drop past release specific classes. As part of the migration to charmhub we have also changed the release strategy from having every release support all previous supported os/release combinations to only support current and previous version (to ensure N+1 upgrades). Change-Id: Iaccd569a6d8f1e46b13f34428eb0a5c12daa1602 --- .gitignore | 1 + src/lib/charm/openstack/ovn_chassis.py | 33 +++++--------------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 2f71a88..f53d7ed 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ build interfaces layers *.swp +*.charm diff --git a/src/lib/charm/openstack/ovn_chassis.py b/src/lib/charm/openstack/ovn_chassis.py index cae6bbf..acbab87 100644 --- a/src/lib/charm/openstack/ovn_chassis.py +++ b/src/lib/charm/openstack/ovn_chassis.py @@ -20,37 +20,16 @@ import charms.ovn_charm charm.use_defaults('charm.default-select-release') -class TrainOVNChassisCharm(charms.ovn_charm.DeferredEventMixin, - charms.ovn_charm.BaseTrainOVNChassisCharm): +class OVNChassisCharm(charms.ovn_charm.DeferredEventMixin, + charms.ovn_charm.BaseOVNChassisCharm): # OpenvSwitch and OVN is distributed as part of the Ubuntu Cloud Archive - # Pockets get their name from OpenStack releases - release = 'train' - name = 'ovn-chassis' - - # Setting an empty source_config_key activates special handling of release - # selection suitable for subordinate charms - source_config_key = '' - - -class UssuriOVNChassisCharm(charms.ovn_charm.DeferredEventMixin, - charms.ovn_charm.BaseUssuriOVNChassisCharm): - # OpenvSwitch and OVN is distributed as part of the Ubuntu Cloud Archive - # Pockets get their name from OpenStack releases + # Pockets get their name from OpenStack releases. + # + # This defines the earliest version this charm can support, actually + # installed version is selected by the principle charm. release = 'ussuri' name = 'ovn-chassis' # Setting an empty source_config_key activates special handling of release # selection suitable for subordinate charms source_config_key = '' - - -class WallabyOVNChassisCharm(charms.ovn_charm.DeferredEventMixin, - charms.ovn_charm.BaseWallabyOVNChassisCharm): - # OpenvSwitch and OVN is distributed as part of the Ubuntu Cloud Archive - # Pockets get their name from OpenStack releases - release = 'wallaby' - name = 'ovn-chassis' - - # Setting an empty source_config_key activates special handling of release - # selection suitable for subordinate charms - source_config_key = ''