From 194a2d65a9562056614ad16e9aeb7a20597a26f8 Mon Sep 17 00:00:00 2001 From: Pedro Date: Thu, 23 Aug 2018 22:04:55 +0200 Subject: [PATCH] Import statement removed on core.py from charms_openstack.charm import defaults was removed to allow Trusty's python 3.4 to run. Two variables that were present on defaults.py were migrated to core.py to allow removal. Change-Id: I90d3aae867a21417b701e0fd40a75a57d827eb52 Closes-Bug: #1788610 --- charms_openstack/charm/core.py | 8 ++++++-- charms_openstack/charm/defaults.py | 6 ++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charms_openstack/charm/core.py b/charms_openstack/charm/core.py index 4846e6c..4e1a5cb 100644 --- a/charms_openstack/charm/core.py +++ b/charms_openstack/charm/core.py @@ -21,7 +21,11 @@ import charms.reactive.relations as relations import charms_openstack.adapters as os_adapters import charms_openstack.ip as os_ip -from charms_openstack.charm import defaults as os_defaults + +# Used to store the discovered release version for caching between invocations +OPENSTACK_RELEASE_KEY = 'charmers.openstack-release-version' +OPENSTACK_PACKAGE_TYPE_KEY = 'charmers.openstack-package-type' + # _releases{} is a dictionary of release -> class that is instantiated # according to the the release that is being requested. i.e. a charm can @@ -905,7 +909,7 @@ class BaseOpenStackCharmActions(object): hookenv.status_set('maintenance', 'Running openstack upgrade') new_src = self.config['openstack-origin'] new_os_rel = os_utils.get_os_codename_install_source(new_src) - unitdata.kv().set(os_defaults.OPENSTACK_RELEASE_KEY, + unitdata.kv().set(OPENSTACK_RELEASE_KEY, new_os_rel) target_charm = get_charm_instance(new_os_rel) target_charm.do_openstack_pkg_upgrade() diff --git a/charms_openstack/charm/defaults.py b/charms_openstack/charm/defaults.py index 0ea7e48..fd0b698 100644 --- a/charms_openstack/charm/defaults.py +++ b/charms_openstack/charm/defaults.py @@ -5,6 +5,8 @@ import charms.reactive as reactive from charms_openstack.charm.classes import OpenStackCharm from charms_openstack.charm.core import register_os_release_selector from charms_openstack.charm.core import register_package_type_selector +from charms_openstack.charm.core import OPENSTACK_RELEASE_KEY +from charms_openstack.charm.core import OPENSTACK_PACKAGE_TYPE_KEY # The default handlers that charms.openstack provides. ALLOWED_DEFAULT_HANDLERS = [ @@ -24,10 +26,6 @@ ALLOWED_DEFAULT_HANDLERS = [ # Where to store the default handler functions for each default state _default_handler_map = {} -# Used to store the discovered release version for caching between invocations -OPENSTACK_RELEASE_KEY = 'charmers.openstack-release-version' -OPENSTACK_PACKAGE_TYPE_KEY = 'charmers.openstack-package-type' - def use_defaults(*defaults): """Activate the default functionality for various handlers