Skip to content

Commit

Permalink
Merge pull request openstack-charmers#73 from gnuoy/diable-netplan-plumb
Browse files Browse the repository at this point in the history
Disable add_dataport_to_netplan while issue openstack-charmers#72 is investigated
  • Loading branch information
andrewdmcleod committed Sep 30, 2019
2 parents 65bb49e + 64ddda0 commit 529516d
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions zaza/openstack/utilities/openstack.py
Original file line number Diff line number Diff line change
Expand Up @@ -608,10 +608,9 @@ def configure_gateway_ext_port(novaclient, neutronclient,
port = neutronclient.create_port(body=body_value)
server.interface_attach(port_id=port['port']['id'],
net_id=None, fixed_ip=None)
if add_dataport_to_netplan:
add_interface_to_netplan(server.name,
mac_address=get_mac_from_port(port),
dvr_mode=dvr_mode)
# Temporarily disable call to add_interface_to_netplan as it
# sometimes throws a KeyError
# https://github.com/openstack-charmers/zaza-openstack-tests/issues/72
ext_br_macs = []
for port in neutronclient.list_ports(network_id=net_id)['ports']:
if 'ext-port' in port['name']:
Expand Down

0 comments on commit 529516d

Please sign in to comment.