diff --git a/charms/nova-k8s/requirements.txt b/charms/nova-k8s/requirements.txt index 10b8e8ee..635d2a1e 100644 --- a/charms/nova-k8s/requirements.txt +++ b/charms/nova-k8s/requirements.txt @@ -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 diff --git a/charms/nova-k8s/src/charm.py b/charms/nova-k8s/src/charm.py index 43b1a345..49a9df15 100755 --- a/charms/nova-k8s/src/charm.py +++ b/charms/nova-k8s/src/charm.py @@ -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) diff --git a/charms/nova-k8s/unit_tests/test_nova_charm.py b/charms/nova-k8s/unit_tests/test_nova_charm.py index 9e4dbe2c..8b50e181 100644 --- a/charms/nova-k8s/unit_tests/test_nova_charm.py +++ b/charms/nova-k8s/unit_tests/test_nova_charm.py @@ -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()