9c12812735
Some major changes: * the charm has been rebased (from a Python perspective) to be rooted in the charm directory. This is a single root. * Imports have been changed so that the don't add lots of imports to the namespace of the module doing the import. * The code that used to run at module import time has been made lazy such that it only has to run if the relevant functions are called. This includes restart_on_change parameters, the harden function and the parameters to the guard_map. Appropriate changes will be submitted to charm-helpers. * Several tests had to be re-written as (incorrect) mocking meant that text fixtures didn't actually match what the code was doing. Thus, the tests were meaningless. * This has had a net positive impact on the unit tests wrt to importing modules and mocking. Change-Id: Id07d9d1caaa9b29453a63c2e49ba831071e9457f
58 lines
1.9 KiB
Python
Executable File
58 lines
1.9 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
#
|
|
# Copyright 2016 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.
|
|
|
|
import os
|
|
import sys
|
|
|
|
_path = os.path.dirname(os.path.realpath(__file__))
|
|
_root = os.path.abspath(os.path.join(_path, '..'))
|
|
|
|
|
|
def _add_path(path):
|
|
if path not in sys.path:
|
|
sys.path.insert(1, path)
|
|
|
|
_add_path(_root)
|
|
|
|
import charmhelpers.contrib.openstack.utils as ch_utils
|
|
import charmhelpers.core.hookenv as hookenv
|
|
import hooks.nova_cc_utils as utils
|
|
import hooks.nova_cc_hooks as hooks
|
|
|
|
|
|
def openstack_upgrade():
|
|
"""Upgrade packages to config-set Openstack version.
|
|
|
|
If the charm was installed from source we cannot upgrade it.
|
|
For backwards compatibility a config flag must be set for this
|
|
code to run, otherwise a full service level upgrade will fire
|
|
on config-changed."""
|
|
|
|
if (ch_utils.do_action_openstack_upgrade('nova-common',
|
|
utils.do_openstack_upgrade,
|
|
hooks.CONFIGS)):
|
|
for rid in hookenv.relation_ids('neutron-api'):
|
|
hooks.neutron_api_relation_joined(rid=rid, remote_restart=True)
|
|
# NOTE(thedac): Force re-fire of shared-db joined hook
|
|
# to ensure that nova_api database is setup if required.
|
|
for r_id in hookenv.relation_ids('shared-db'):
|
|
hooks.db_joined(relation_id=r_id)
|
|
hooks.config_changed()
|
|
|
|
if __name__ == '__main__':
|
|
hooks.resolve_CONFIGS()
|
|
openstack_upgrade()
|