commit 77782e09719bc209ab1198f2b175789e3f728fb6
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Oct 08 16:31:53 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Oct 08 16:31:53 2019 +0000
tree fb50343c1553d81f5aaa8e0fea0555e6a0b9d3f2
parent d9a97d3da1728f247b755f9d343a8994291590b6
parent b979877ab7ae123a7ec90357bcdc0d50314c1a4f

Merge "Add virt:nic:baremetal and use it for golden"

salt/control/sizes/openstack/golden.yml

diff --git a/salt/control/sizes/openstack/golden.yml b/salt/control/sizes/openstack/golden.yml
index 47a35e4..39d70d9 100644
--- a/salt/control/sizes/openstack/golden.yml
+++ b/salt/control/sizes/openstack/golden.yml
@@ -39,7 +39,7 @@
     salt_control_size_cpu_openstack_baremetal: 4
     salt_control_size_ram_openstack_baremetal: 4096
     salt_control_size_disk_profile_openstack_baremetal: small
-    salt_control_size_net_profile_openstack_baremetal: default
+    salt_control_size_net_profile_openstack_baremetal: baremetal
   salt:
     control:
       size:

salt/control/virt.yml

diff --git a/salt/control/virt.yml b/salt/control/virt.yml
index 08c1bca..8f599bd 100644
--- a/salt/control/virt.yml
+++ b/salt/control/virt.yml
@@ -14,6 +14,16 @@
         eth0:
           bridge: br1
           model: virtio
+      baremetal:
+        eth2:
+          bridge: br0
+          model: virtio
+        eth1:
+          bridge: br1
+          model: virtio
+        eth0:
+          bridge: br2
+          model: virtio
     disk:
       default:
         - system: