commit 4c46819a2f82db307fbcf3bd566f1fb077e93a93
author Vasyl Saienko <vsaienko@mirantis.com> Tue May 19 11:51:13 2020 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Tue May 19 15:46:03 2020 +0300
tree 58c4d735b7fd9aa3c455571be53490e1aa9a9a90
parent 21493b3bfbe1dc92b96ae630b4052944e39847ba

Create pair of virtual interfaces for baremetal network

Create pair of veth interfaces and plug then to linux bridge, will allow
to connect virtualized nodes to physics via ovs bridges.

Related-Prod: PRODX-3456
Change-Id: Icabdd75bbb5fca4962eb1161a6a518b22ae13d7e

de/heat-templates/top.yaml

diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 9b06fca..8a8b388 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -117,9 +117,10 @@
   ironic_baremetal_network_gateway:
     type: string
     default: ''
-  ironic_baremetal_interface:
+  ironic_baremetal_network_interface:
     type: string
-    default: 'ens7'
+    default: 'veth-bm'
+    description: 'The name of interface that should be added to ovs bridge with taps from vbms VMs.'
   ucp_metadata:
     type: json
     default: {"role":"ucp"}
@@ -330,7 +331,7 @@
           storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
           ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
           ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
+          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   cmps:
@@ -369,7 +370,7 @@
           storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
           ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
           ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
+          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   gtws:
@@ -404,7 +405,7 @@
           storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
           ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
           ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
+          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   lmas:
@@ -439,7 +440,7 @@
           storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
           ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
           ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
+          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   osds:
@@ -478,7 +479,7 @@
           storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
           ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
           ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
+          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   spares:  # spares for osds/cmps
@@ -517,7 +518,7 @@
           storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
           ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
           ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
+          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   ntws:
@@ -552,7 +553,7 @@
           storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
           ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
           ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
+          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   vbmcs:
@@ -587,7 +588,7 @@
           storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
           ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
           ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_interface: { get_param: ironic_baremetal_interface }
+          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
 outputs:
@@ -638,6 +639,8 @@
     value: { get_param: ironic_baremetal_network_pool_start }
   ironic_baremetal_network_pool_end:
     value: { get_param: ironic_baremetal_network_pool_end }
+  ironic_baremetal_network_interface:
+    value: { get_param: ironic_baremetal_network_interface }
   tunnel_interface:
     value: { get_param: tunnel_interface }
   live_migration_interface: