openstack/charm-nova-compute
Code Issues Proposed changes

refactoring do_openstack_upgrade to accept configs argument, bringing it in line with the other openstack charms

Browse Source
This commit is contained in:
David Della Vecchia 2015-10-06 15:38:12 +00:00
parent 4c82e947f5
commit 2e971f0ac8
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/openstack_upgrade.py
View File

@ -23,7 +23,7 @@ def openstack_upgrade():
code to run, otherwise a full service level upgrade will fire code to run, otherwise a full service level upgrade will fire
on config-changed.""" on config-changed."""
if (do_action_openstack_upgrade('nova_compute-common', if (do_action_openstack_upgrade('nova-common',
do_openstack_upgrade, do_openstack_upgrade,
CONFIGS)): CONFIGS)):
config_changed() config_changed()

2
hooks/nova_compute_hooks.py
View File

@ -108,7 +108,7 @@ def config_changed():
git_install(config('openstack-origin-git')) git_install(config('openstack-origin-git'))
elif not config('action-managed-upgrade'): elif not config('action-managed-upgrade'):
if openstack_upgrade_available('nova-common'): if openstack_upgrade_available('nova-common'):
CONFIGS = do_openstack_upgrade() do_openstack_upgrade(CONFIGS)
sysctl_dict = config('sysctl') sysctl_dict = config('sysctl')
if sysctl_dict: if sysctl_dict:

4
hooks/nova_compute_utils.py
View File

@ -523,7 +523,7 @@ def import_authorized_keys(user='root', prefix=None):
_keys.write('{}\n'.format(authorized_keys[index])) _keys.write('{}\n'.format(authorized_keys[index]))
def do_openstack_upgrade(): def do_openstack_upgrade(configs):
# NOTE(jamespage) horrible hack to make utils forget a cached value # NOTE(jamespage) horrible hack to make utils forget a cached value
import charmhelpers.contrib.openstack.utils as utils import charmhelpers.contrib.openstack.utils as utils
utils.os_rel = None utils.os_rel = None
@ -543,10 +543,8 @@ def do_openstack_upgrade():
apt_install(determine_packages(), fatal=True) apt_install(determine_packages(), fatal=True)
# Regenerate configs in full for new release # Regenerate configs in full for new release
configs = register_configs()
configs.write_all() configs.write_all()
[service_restart(s) for s in services()] [service_restart(s) for s in services()]
return configs
def import_keystone_ca_cert(): def import_keystone_ca_cert():