openstack/sunbeam-charms
Code Issues Proposed changes

Merge pull request #7 from openstack-charmers/switch-to-xena

Browse Source 
Switch to xena and pin aso
This commit is contained in:
Liam Young 2022-02-25 10:56:05 +00:00 committed by GitHub
commit 9fbd49a99d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charms/nova-k8s/requirements.txt
View File

@ -1,6 +1,6 @@
jinja2
git+https://opendev.org/openstack/charm-ops-openstack#egg=ops_openstack
git+https://github.com/openstack-charmers/advanced-sunbeam-openstack#egg=advanced_sunbeam_openstack
git+https://github.com/openstack-charmers/advanced-sunbeam-openstack@v0.1#egg=advanced_sunbeam_openstack
lightkube
# These are only needeed if the charm relates to ceph
git+https://github.com/openstack/charm-ops-interface-ceph-client#egg=interface_ceph_client

6
charms/nova-k8s/src/charm.py
View File

@ -209,11 +209,11 @@ class NovaOperatorCharm(sunbeam_charm.OSBaseOperatorAPICharm):
super().configure_charm(event)
class NovaWallabyOperatorCharm(NovaOperatorCharm):
class NovaXenaOperatorCharm(NovaOperatorCharm):
openstack_release = 'wallaby'
openstack_release = 'xena'
if __name__ == "__main__":
# Note: use_juju_for_storage=True required per
# https://github.com/canonical/operator/issues/506
main(NovaWallabyOperatorCharm, use_juju_for_storage=True)
main(NovaXenaOperatorCharm, use_juju_for_storage=True)

4
charms/nova-k8s/unit_tests/test_nova_charm.py
View File

@ -24,7 +24,7 @@ import charm
import advanced_sunbeam_openstack.test_utils as test_utils
class _NovaWallabyOperatorCharm(charm.NovaWallabyOperatorCharm):
class _NovaXenaOperatorCharm(charm.NovaXenaOperatorCharm):
def __init__(self, framework):
self.seen_events = []
@ -48,7 +48,7 @@ class TestNovaOperatorCharm(test_utils.CharmTestCase):
def setUp(self, mock_patch):
super().setUp(charm, self.PATCHES)
self.harness = test_utils.get_harness(
_NovaWallabyOperatorCharm,
_NovaXenaOperatorCharm,
container_calls=self.container_calls)
self.addCleanup(self.harness.cleanup)
self.harness.begin()