From 4cdf7920320174d3d40750edb65b2e43b49ea1f9 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 22 Aug 2017 14:08:40 +0000 Subject: [PATCH] Perform all host network configuration in a single pass The MichaelRigart.interfaces role has now been updated to support more complex network topologies, including VLAN subinterfaces of bridges, and bridges with a bonded interface as a port. --- ansible/network.yml | 14 -------------- ansible/requirements.yml | 4 ++++ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/ansible/network.yml b/ansible/network.yml index ad3ccb326..3c06f5e16 100644 --- a/ansible/network.yml +++ b/ansible/network.yml @@ -51,15 +51,9 @@ - role: ahuffman.resolv become: True - # On the first pass we configure all ethernet interfaces that are not on - # VLANs and all bridges. On the second pass we configure all ethernet - # interfaces that are on VLANs. This allows us to specify VLAN interfaces - # on bridges. - - role: MichaelRigart.interfaces interfaces_ether_interfaces: > {{ ether_interfaces | - net_reject_vlans | map('net_interface_obj') | list }} interfaces_bridge_interfaces: > @@ -72,14 +66,6 @@ list }} become: True - - role: MichaelRigart.interfaces - interfaces_ether_interfaces: > - {{ ether_interfaces | - net_select_vlans | - map('net_interface_obj') | - list }} - become: True - # Configure a virtual ethernet patch links to connect the workload provision # and external network bridges to the Neutron OVS bridge. - name: Ensure controller workload OVS patch links exist diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 70031cec2..299ea7157 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -2,6 +2,10 @@ - src: ahuffman.resolv - src: jriguera.configdrive - src: MichaelRigart.interfaces +# Use our fork until the interface bounce rework patch is merged. +- src: https://github.com/stackhpc/ansible-role-interfaces + version: rework-bouncing + name: MichaelRigart.interfaces - src: mrlesmithjr.manage-lvm - src: resmo.ntp - src: stackhpc.drac