From f4d3d05a13ff79c3d96a3948badb6c2e53961e7c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 20 Jul 2020 11:49:57 -0700
Subject: [PATCH] inventory/bridgeify: try and see about getting bridgeify
 working more generally.

This playbook uses linux-system-roles to set the bridge on virthosts.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 .../vmhost-x86-01.stg.iad2.fedoraproject.org  |  2 ++
 playbooks/bridgeify.yml                       | 24 +------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org
index 9782477195..c1f4374f93 100644
--- a/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org
@@ -18,3 +18,5 @@ mac1: ec:f4:bb:d2:85:ec
 mac2: ec:f4:bb:d2:85:ed
 mac3: ec:f4:bb:d2:85:e8
 mac4: ec:f4:bb:d2:85:ea
+
+br0_port0_mac: "{{ mac3 }}"
diff --git a/playbooks/bridgeify.yml b/playbooks/bridgeify.yml
index 92180a7864..48d6b1d04c 100644
--- a/playbooks/bridgeify.yml
+++ b/playbooks/bridgeify.yml
@@ -28,29 +28,7 @@
         state: up
         type: ethernet
         master: br0
-        mac: "{{ mac1 }}"
-
-      - name: br1
-        state: up
-        type: bridge
-        autoconnect: yes
-        ip:
-          dhcp4: no
-          auto6: no
-
-      - name: br1-port0
-        state: up
-        type: ethernet
-        master: br1
-        mac: "{{ mac2 }}"
-
-      - name: eno3
-        type: ethernet
-        mac: "{{ mac3 }}"
-
-      - name: eno4
-        type: ethernet
-        mac: "{{ mac4 }}"
+        mac: "{{ br0_port0_mac }}"
 
   roles:
     - role: linux-system-roles.network