Actions: Move concrete charm module to works with layer-openstack

This patchset fixes the reference bug by moving the concrete charm class
module to lib/charm/openstack/ from lib/charms.  This is so that the
bus.discover() function in layer-openstack [1] can find the concrete
class and instantiate it.  The patchset is dependent on the layer-ovn
(linked below).

[1]: https://review.opendev.org/p/openstack/charm-layer-openstack
Depends On: https://github.com/openstack-charmers/charm-layer-ovn/pull/4

Change-Id: Icf5492e733c5068622bd84243c88ddb7942bf0d7
Closes-Bug: #1861069
This commit is contained in:
Alex Kavanagh 2020-01-30 14:26:52 +00:00
parent 9dcd53bb75
commit efdffd1ca3
5 changed files with 15 additions and 4 deletions

View File

@ -0,0 +1,13 @@
# Copyright 2019 Canonical Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

View File

@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import os
import charms.reactive as reactive
import charms.leadership as leadership
@ -21,7 +19,7 @@ import charms_openstack.bus
import charms_openstack.charm as charm
charms_openstack.bus.discover(os.path.join('lib', 'charms'))
charms_openstack.bus.discover()
# Use the charms.openstack defaults for common states and hooks
charm.use_defaults(

View File

@ -18,7 +18,7 @@ import os
import charms_openstack.test_utils as test_utils
import charms.ovn_central as ovn_central
import charm.openstack.ovn_central as ovn_central
class Helper(test_utils.PatchHelper):