openstack/charm-neutron-api
Code Issues Proposed changes

[trivial] Switch default package to -common to enable liberty support

Browse Source
This commit is contained in:
James Page 2015-09-03 17:26:15 +01:00
commit 109365b3d1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/neutron_api_hooks.py
View File

@ -98,7 +98,7 @@ CONFIGS = register_configs()
def conditional_neutron_migration(): def conditional_neutron_migration():
if os_release('neutron-server') < 'kilo': if os_release('neutron-common') < 'kilo':
log('Not running neutron database migration as migrations are handled ' log('Not running neutron database migration as migrations are handled '
'by the neutron-server process or nova-cloud-controller charm.') 'by the neutron-server process or nova-cloud-controller charm.')
return return
@ -180,7 +180,7 @@ def config_changed():
if config_value_changed('openstack-origin-git'): if config_value_changed('openstack-origin-git'):
git_install(config('openstack-origin-git')) git_install(config('openstack-origin-git'))
else: else:
if openstack_upgrade_available('neutron-server'): if openstack_upgrade_available('neutron-common'):
do_openstack_upgrade(CONFIGS) do_openstack_upgrade(CONFIGS)
apt_install(filter_installed_packages( apt_install(filter_installed_packages(

4
hooks/neutron_api_utils.py
View File

@ -245,7 +245,7 @@ def resource_map():
def register_configs(release=None): def register_configs(release=None):
release = release or os_release('neutron-server') release = release or os_release('neutron-common')
configs = templating.OSConfigRenderer(templates_dir=TEMPLATES, configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
openstack_release=release) openstack_release=release)
for cfg, rscs in resource_map().iteritems(): for cfg, rscs in resource_map().iteritems():
@ -283,7 +283,7 @@ def do_openstack_upgrade(configs):
:param configs: The charms main OSConfigRenderer object. :param configs: The charms main OSConfigRenderer object.
""" """
cur_os_rel = os_release('neutron-server') cur_os_rel = os_release('neutron-common')
new_src = config('openstack-origin') new_src = config('openstack-origin')
new_os_rel = get_os_codename_install_source(new_src) new_os_rel = get_os_codename_install_source(new_src)

6
unit_tests/test_neutron_api_utils.py
View File

@ -227,7 +227,7 @@ class TestNeutronAPIUtils(CharmTestCase):
self.get_os_codename_install_source.return_value = 'juno' self.get_os_codename_install_source.return_value = 'juno'
configs = MagicMock() configs = MagicMock()
nutils.do_openstack_upgrade(configs) nutils.do_openstack_upgrade(configs)
self.os_release.assert_called_with('neutron-server') self.os_release.assert_called_with('neutron-common')
self.log.assert_called() self.log.assert_called()
self.configure_installation_source.assert_called_with( self.configure_installation_source.assert_called_with(
'cloud:trusty-juno' 'cloud:trusty-juno'
@ -266,7 +266,7 @@ class TestNeutronAPIUtils(CharmTestCase):
self.get_os_codename_install_source.return_value = 'kilo' self.get_os_codename_install_source.return_value = 'kilo'
configs = MagicMock() configs = MagicMock()
nutils.do_openstack_upgrade(configs) nutils.do_openstack_upgrade(configs)
self.os_release.assert_called_with('neutron-server') self.os_release.assert_called_with('neutron-common')
self.log.assert_called() self.log.assert_called()
self.configure_installation_source.assert_called_with( self.configure_installation_source.assert_called_with(
'cloud:trusty-kilo' 'cloud:trusty-kilo'
@ -306,7 +306,7 @@ class TestNeutronAPIUtils(CharmTestCase):
self.get_os_codename_install_source.return_value = 'kilo' self.get_os_codename_install_source.return_value = 'kilo'
configs = MagicMock() configs = MagicMock()
nutils.do_openstack_upgrade(configs) nutils.do_openstack_upgrade(configs)
self.os_release.assert_called_with('neutron-server') self.os_release.assert_called_with('neutron-common')
self.log.assert_called() self.log.assert_called()
self.configure_installation_source.assert_called_with( self.configure_installation_source.assert_called_with(
'cloud:trusty-kilo' 'cloud:trusty-kilo'