diff options
Diffstat (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/linux_net.py')
| -rw-r--r-- | fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/linux_net.py | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/linux_net.py b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/linux_net.py index bbbcc98..10ddff7 100644 --- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/linux_net.py +++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/linux_net.py @@ -24,11 +24,13 @@ import re import time import netaddr +import netifaces from oslo_concurrency import processutils from oslo_config import cfg from oslo_log import log as logging from oslo_serialization import jsonutils from oslo_utils import excutils +from oslo_utils import fileutils from oslo_utils import importutils from oslo_utils import timeutils import six @@ -36,7 +38,6 @@ import six from nova import exception from nova.i18n import _, _LE, _LW from nova import objects -from nova.openstack.common import fileutils from nova import paths from nova.pci import utils as pci_utils from nova import utils @@ -108,6 +109,8 @@ linux_net_opts = [ help='The IP address for the metadata API server'), cfg.IntOpt('metadata_port', default=8775, + min=1, + max=65535, help='The port for the metadata API port'), cfg.StrOpt('iptables_top_regex', default='', @@ -394,7 +397,7 @@ class IptablesManager(object): elif ip_version == 6: tables = self.ipv6 - for table, chains in builtin_chains[ip_version].iteritems(): + for table, chains in six.iteritems(builtin_chains[ip_version]): for chain in chains: tables[table].add_chain(chain) tables[table].add_rule(chain, '-j $%s' % (chain,), @@ -426,11 +429,11 @@ class IptablesManager(object): self.apply() def dirty(self): - for table in self.ipv4.itervalues(): + for table in six.itervalues(self.ipv4): if table.dirty: return True if CONF.use_ipv6: - for table in self.ipv6.itervalues(): + for table in six.itervalues(self.ipv6): if table.dirty: return True return False @@ -461,7 +464,7 @@ class IptablesManager(object): run_as_root=True, attempts=5) all_lines = all_tables.split('\n') - for table_name, table in tables.iteritems(): + for table_name, table in six.iteritems(tables): start, end = self._find_table(all_lines, table_name) all_lines[start:end] = self._modify_rules( all_lines[start:end], table, table_name) @@ -485,7 +488,7 @@ class IptablesManager(object): def _modify_rules(self, current_lines, table, table_name): unwrapped_chains = table.unwrapped_chains - chains = table.chains + chains = sorted(table.chains) remove_chains = table.remove_chains rules = table.rules remove_rules = table.remove_rules @@ -1549,9 +1552,11 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver): @staticmethod @utils.synchronized('lock_vlan', external=True) - def ensure_vlan(vlan_num, bridge_interface, mac_address=None, mtu=None): + def ensure_vlan(vlan_num, bridge_interface, mac_address=None, mtu=None, + interface=None): """Create a vlan unless it already exists.""" - interface = 'vlan%s' % vlan_num + if interface is None: + interface = 'vlan%s' % vlan_num if not device_exists(interface): LOG.debug('Starting VLAN interface %s', interface) _execute('ip', 'link', 'add', 'link', bridge_interface, @@ -1599,14 +1604,16 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver): """ if not device_exists(bridge): LOG.debug('Starting Bridge %s', bridge) - _execute('brctl', 'addbr', bridge, run_as_root=True) + out, err = _execute('brctl', 'addbr', bridge, + check_exit_code=False, run_as_root=True) + if (err and err != "device %s already exists; can't create " + "bridge with the same name\n" % (bridge)): + msg = _('Failed to add bridge: %s') % err + raise exception.NovaException(msg) + _execute('brctl', 'setfd', bridge, 0, run_as_root=True) # _execute('brctl setageing %s 10' % bridge, run_as_root=True) _execute('brctl', 'stp', bridge, 'off', run_as_root=True) - # (danwent) bridge device MAC address can't be set directly. - # instead it inherits the MAC address of the first device on the - # bridge, which will either be the vlan interface, or a - # physical NIC. _execute('ip', 'link', 'set', bridge, 'up', run_as_root=True) if interface: @@ -1619,6 +1626,18 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver): msg = _('Failed to add interface: %s') % err raise exception.NovaException(msg) + # NOTE(apmelton): Linux bridge's default behavior is to use the + # lowest mac of all plugged interfaces. This isn't a problem when + # it is first created and the only interface is the bridged + # interface. But, as instance interfaces are plugged, there is a + # chance for the mac to change. So, set it here so that it won't + # change in the future. + if not CONF.fake_network: + interface_addrs = netifaces.ifaddresses(interface) + interface_mac = interface_addrs[netifaces.AF_LINK][0]['addr'] + _execute('ip', 'link', 'set', bridge, 'address', interface_mac, + run_as_root=True) + out, err = _execute('ip', 'link', 'set', interface, 'up', check_exit_code=False, run_as_root=True) |