5a5e542f9a
In the first patch I forgot to ensure that we also reload the configs that are globally declared in cinder_hooks and therefore loaded on import. So here it is. Change-Id: I613959fa91912b388aea8bd6926d085956c1d67e Closes-Bug: #1726527
62 lines
1.8 KiB
Python
Executable File
62 lines
1.8 KiB
Python
Executable File
#!/usr/bin/python
|
|
#
|
|
# 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 sys
|
|
import uuid
|
|
|
|
sys.path.append('hooks/')
|
|
|
|
from charmhelpers.contrib.openstack.utils import (
|
|
do_action_openstack_upgrade,
|
|
)
|
|
|
|
from charmhelpers.core.hookenv import (
|
|
relation_ids,
|
|
relation_set,
|
|
)
|
|
|
|
import cinder_hooks
|
|
|
|
from cinder_utils import (
|
|
do_openstack_upgrade,
|
|
register_configs,
|
|
)
|
|
|
|
|
|
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 (do_action_openstack_upgrade('cinder-common',
|
|
do_openstack_upgrade,
|
|
configs=None)):
|
|
# tell any storage-backends we just upgraded
|
|
for rid in relation_ids('storage-backend'):
|
|
relation_set(relation_id=rid,
|
|
upgrade_nonce=uuid.uuid4())
|
|
|
|
# Force reload to get any chances resulting from upgrade.
|
|
# See LP 1726527.
|
|
cinder_hooks.CONFIGS = register_configs()
|
|
cinder_hooks.config_changed()
|
|
|
|
if __name__ == '__main__':
|
|
openstack_upgrade()
|