openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Ensure configuration changes propagated fully

Browse Source 
nova-cloud-controller provides its region setting to the nova
services hosted in neutron-gateway units; ensure that any changes
to configuration are correctly propagated to related units.

Change-Id: Iea002d4379339abf64742409e36d237b163420c5
Closes-Bug: 1513411
This commit is contained in:
James Page 2017-02-02 12:42:07 +00:00
parent 2eef644a5c
commit ad6fbd48db
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/nova_cc_hooks.py
View File

@ -272,6 +272,8 @@ def config_changed():
if filtered: if filtered:
apt_install(filtered, fatal=True) apt_install(filtered, fatal=True)
for rid in relation_ids('quantum-network-service'):
quantum_joined(rid=rid)
for r_id in relation_ids('identity-service'): for r_id in relation_ids('identity-service'):
identity_joined(rid=r_id) identity_joined(rid=r_id)
for rid in relation_ids('zeromq-configuration'): for rid in relation_ids('zeromq-configuration'):

5
unit_tests/test_nova_cc_hooks.py
View File

@ -206,6 +206,7 @@ class NovaCCHooksTests(CharmTestCase):
self.git_install.assert_called_with(projects_yaml) self.git_install.assert_called_with(projects_yaml)
self.assertFalse(self.do_openstack_upgrade.called) self.assertFalse(self.do_openstack_upgrade.called)
@patch.object(hooks, 'quantum_joined')
@patch.object(hooks, 'determine_packages') @patch.object(hooks, 'determine_packages')
@patch.object(utils, 'service_resume') @patch.object(utils, 'service_resume')
@patch('charmhelpers.contrib.openstack.ip.unit_get') @patch('charmhelpers.contrib.openstack.ip.unit_get')
@ -225,7 +226,8 @@ class NovaCCHooksTests(CharmTestCase):
utils_config, mock_relids, utils_config, mock_relids,
mock_unit_get, mock_unit_get,
mock_service_resume, mock_service_resume,
mock_determine_packages): mock_determine_packages,
mock_quantum_joined):
mock_determine_packages.return_value = [] mock_determine_packages.return_value = []
self.git_install_requested.return_value = False self.git_install_requested.return_value = False
self.openstack_upgrade_available.return_value = True self.openstack_upgrade_available.return_value = True
@ -244,6 +246,7 @@ class NovaCCHooksTests(CharmTestCase):
self.assertTrue(db_joined.called) self.assertTrue(db_joined.called)
self.assertTrue(self.save_script_rc.called) self.assertTrue(self.save_script_rc.called)
mock_filter_packages.assert_called_with([]) mock_filter_packages.assert_called_with([])
self.assertTrue(mock_quantum_joined.called)
@patch.object(utils, 'service_resume') @patch.object(utils, 'service_resume')
@patch.object(hooks, 'filter_installed_packages') @patch.object(hooks, 'filter_installed_packages')