openstack/charm-neutron-openvswitch
Code Issues Proposed changes

reverted last commit

Browse Source
This commit is contained in:
Edward Hope-Morley 2015-02-12 12:31:58 +00:00
parent 41c60693e8
commit 5f162c20bd
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/neutron_ovs_utils.py
View File

@ -13,8 +13,6 @@ NEUTRON_CONF_DIR = "/etc/neutron"
NEUTRON_CONF = '%s/neutron.conf' % NEUTRON_CONF_DIR NEUTRON_CONF = '%s/neutron.conf' % NEUTRON_CONF_DIR
NEUTRON_DEFAULT = '/etc/default/neutron-server' NEUTRON_DEFAULT = '/etc/default/neutron-server'
ML2_CONF = '%s/plugins/ml2/ml2_conf.ini' % NEUTRON_CONF_DIR ML2_CONF = '%s/plugins/ml2/ml2_conf.ini' % NEUTRON_CONF_DIR
ML2_OVS_CONF = ('%s/plugins/openvswitch/ovs_neutron_plugin.ini' %
NEUTRON_CONF_DIR)
PHY_NIC_MTU_CONF = '/etc/init/os-charm-phy-nic-mtu.conf' PHY_NIC_MTU_CONF = '/etc/init/os-charm-phy-nic-mtu.conf'
TEMPLATES = 'templates/' TEMPLATES = 'templates/'
@ -28,10 +26,6 @@ BASE_RESOURCE_MAP = OrderedDict([
'services': ['neutron-plugin-openvswitch-agent'], 'services': ['neutron-plugin-openvswitch-agent'],
'contexts': [neutron_ovs_context.OVSPluginContext()], 'contexts': [neutron_ovs_context.OVSPluginContext()],
}), }),
(ML2_OVS_CONF, {
'services': ['neutron-plugin-openvswitch-agent'],
'contexts': [neutron_ovs_context.OVSPluginContext()],
}),
(PHY_NIC_MTU_CONF, { (PHY_NIC_MTU_CONF, {
'services': ['os-charm-phy-nic-mtu'], 'services': ['os-charm-phy-nic-mtu'],
'contexts': [neutron_ovs_context.PhyNICMTUContext()], 'contexts': [neutron_ovs_context.PhyNICMTUContext()],

6
templates/icehouse/ovs_neutron_plugin.ini
View File

@ -1,6 +0,0 @@
[ovs]
[agent]
{% if veth_mtu -%}
veth_mtu = {{ veth_mtu }}
{% endif %}

6
unit_tests/test_neutron_ovs_utils.py
View File

@ -72,8 +72,7 @@ class TestNeutronOVSUtils(CharmTestCase):
_regconfs = nutils.register_configs() _regconfs = nutils.register_configs()
confs = ['/etc/neutron/neutron.conf', confs = ['/etc/neutron/neutron.conf',
'/etc/neutron/plugins/ml2/ml2_conf.ini', '/etc/neutron/plugins/ml2/ml2_conf.ini',
'/etc/init/os-charm-phy-nic-mtu.conf', '/etc/init/os-charm-phy-nic-mtu.conf']
'/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini']
self.assertItemsEqual(_regconfs.configs, confs) self.assertItemsEqual(_regconfs.configs, confs)
def test_resource_map(self): def test_resource_map(self):
@ -87,8 +86,7 @@ class TestNeutronOVSUtils(CharmTestCase):
expect = OrderedDict([ expect = OrderedDict([
(nutils.NEUTRON_CONF, ['neutron-plugin-openvswitch-agent']), (nutils.NEUTRON_CONF, ['neutron-plugin-openvswitch-agent']),
(ML2CONF, ['neutron-plugin-openvswitch-agent']), (ML2CONF, ['neutron-plugin-openvswitch-agent']),
(nutils.PHY_NIC_MTU_CONF, ['os-charm-phy-nic-mtu']), (nutils.PHY_NIC_MTU_CONF, ['os-charm-phy-nic-mtu'])
(nutils.ML2_OVS_CONF, ['neutron-plugin-openvswitch-agent'])
]) ])
self.assertEqual(expect, _restart_map) self.assertEqual(expect, _restart_map)
for item in _restart_map: for item in _restart_map: