Actualize accoring to last formula state
diff --git a/baremetal_simulator/init.sls b/baremetal_simulator/init.sls
index 0f79f65..62f2051 100644
--- a/baremetal_simulator/init.sls
+++ b/baremetal_simulator/init.sls
@@ -21,35 +21,6 @@
- name: /etc/libvirt/qemu.conf
- source: salt://baremetal_simulator/files/qemu-cgroup.conf
-brbm:
- openvswitch_bridge.present
-
-brbm-phy_veth_present:
- cmd.run:
- - 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_veth_present
-
-brbm-to-ovs:
- cmd.run:
- - names:
- - ovs-vsctl --may-exist add-port br-floating brfl-brbm -- set Interface brfl-brbm type=patch options:peer=brbm-brfl
- - ovs-vsctl --may-exist add-port brbm brbm-brfl -- set Interface brbm-brfl type=patch options:peer=brfl-brbm
- - unless: (ovs-vsctl show |grep -q "Port brfl-brbm") && (ovs-vsctl show |grep -q "Port brbm-brfl")
-
default_pool:
cmd.run:
- name: virsh pool-define-as --name default dir --target /var/lib/libvirt/images && virsh pool-autostart default && virsh pool-start default
@@ -130,7 +101,7 @@
{{ node.name }}_tap{{ loop.index }}_in_ovs:
openvswitch_port.present:
- name: tap-{{ node.name }}i{{ loop.index }}
- - bridge: brbm
+ - bridge: br-simulator
{{ node.name }}_port{{ loop.index }}_present:
ironicng.port_present: