Rework brbm-phy creation
diff --git a/baremetal_simulator/init.sls b/baremetal_simulator/init.sls
index 6a62f30..4ff842b 100644
--- a/baremetal_simulator/init.sls
+++ b/baremetal_simulator/init.sls
@@ -24,21 +24,24 @@
brbm:
openvswitch_bridge.present
-brbm-phy:
+brbm-phy_veth_present:
cmd.run:
- - names:
- - ip addr add {{ baremetal_simulator.brbm_net.ip }}/{{ baremetal_simulator.brbm_net.prefix }} dev brbm-phy
- - ip link set dev brbm-phy up || true
- - ip link set dev ovs-brbm up || true
- - ip link add ovs-brbm type veth peer name brbm-phy || true
+ - name: ip link add ovs-brbm type veth peer name brbm-phy && ip link set dev ovs-brbm up && ip link set dev brbm-phy up
+ - unless: ip link show brbm-phy
+
+brbm-phy_phy_ip:
+ cmd.run:
+ - name: ip addr add {{ baremetal_simulator.brbm_net.ip }}/{{ baremetal_simulator.brbm_net.prefix }} dev brbm-phy
- unless: ip addr show dev brbm-phy |grep -q {{ baremetal_simulator.brbm_net.ip }}
+ - require:
+ - brbm-phy_veth_present
ovs-brbm_in_ovs:
openvswitch_port.present:
- name: ovs-brbm
- bridge: brbm
- require:
- - brbm-phy
+ - brbm-phy_veth_present
brbm-to-ovs:
cmd.run: