openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Do not remove `haproxy` package

Browse Source 
The principal charm may have use for it.

Change-Id: I342e3be7067a218c466a94728920377367239887
Closes-Bug: #1832739
This commit is contained in:
Frode Nordahl 2019-06-13 18:48:56 +02:00
parent a1639fe51f
commit 0f4eefcf4e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/neutron_ovs_hooks.py
View File

@ -177,7 +177,9 @@ def neutron_plugin_joined(relation_id=None, request_restart=False):
# in use as this will remove the l3 agent # in use as this will remove the l3 agent
# see https://pad.lv/1515008 # see https://pad.lv/1515008
if not use_dvr(): if not use_dvr():
pkgs.extend(METADATA_PACKAGES) # NOTE(fnordahl) do not remove ``haproxy``, the principal charm may
# have use for it. LP: #1832739
pkgs.extend(set(METADATA_PACKAGES)-set(['haproxy']))
purge_packages(pkgs) purge_packages(pkgs)
secret = get_shared_secret() if enable_nova_metadata() else None secret = get_shared_secret() if enable_nova_metadata() else None
rel_data = { rel_data = {

3
unit_tests/test_neutron_ovs_hooks.py
View File

@ -216,8 +216,7 @@ class NeutronOVSHooksTests(CharmTestCase):
**rel_data **rel_data
) )
self.purge_packages.assert_called_with(['neutron-dhcp-agent', self.purge_packages.assert_called_with(['neutron-dhcp-agent',
'neutron-metadata-agent', 'neutron-metadata-agent'])
'haproxy'])
self.assertFalse(self.install_packages.called) self.assertFalse(self.install_packages.called)
@patch.object(hooks, 'os_release') @patch.object(hooks, 'os_release')