Switch deployments to use ens8 for tunnel interface
* Left ens3 for migration contexts
* Fix returning ip address and netmask in interfaces
* Remove tunnel interface from netplan for dpdk
Related-Prod: PRODX-8554
Change-Id: Id4bd1b65c3de9836b5af72f7d8db2e75fdde02ba
diff --git a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
index 8ed2d5a..8081dd8 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
@@ -116,6 +116,7 @@
$ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
$ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
$ironic_mt_enabled: { get_param: ironic_mt_enabled }
+ $tunnel_interface_ip: { get_attr: [tun_server_port, fixed_ips, 0, ip_address] }
inject_files:
type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index 4e15338..3427b56 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -129,6 +129,7 @@
$ironic_baremetal_interface_ip: { get_attr: [ironic_baremetal_server_port, fixed_ips, 0, ip_address] }
$ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
$ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
+ $tunnel_interface_ip: { get_attr: [tun_server_port, fixed_ips, 0, ip_address] }
$ironic_mt_enabled: { get_param: ironic_mt_enabled }
$huge_pages: { get_param: huge_pages }