Merge "Assign IPs for neutron dynamic routing"
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
index d894a83..fcdf889 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
@@ -27,7 +27,7 @@
metallb_address_pools: '10.11.12.201-10.11.12.254'
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
private_floating_network_gateway: '10.11.12.1'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
index 6bfd22a..03067e7 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
@@ -28,7 +28,7 @@
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_gateway: '10.11.12.1'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
index 0d35d73..f036e43 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
@@ -27,7 +27,7 @@
metallb_address_pools: '10.11.12.201-10.11.12.254'
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
private_floating_network_gateway: '10.11.12.1'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vmx.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vmx.yaml
index 62f54cd..b160edc 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vmx.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vmx.yaml
@@ -39,7 +39,7 @@
metallb_address_pools: '10.11.12.201-10.11.12.254'
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
private_floating_network_gateway: '10.11.12.1'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
index a8eeca9..c4a29b1 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
@@ -26,7 +26,7 @@
metallb_address_pools: '10.11.12.201-10.11.12.254'
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
private_floating_network_gateway: '10.11.12.1'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
index bd74bad..671bd4e 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
@@ -27,7 +27,7 @@
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_gateway: '10.11.12.1'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
index 1271269..ed1ea73 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp2-ntw3.yaml
@@ -26,7 +26,7 @@
metallb_address_pools: '10.11.12.201-10.11.12.254'
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
private_floating_network_gateway: '10.11.12.1'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma0-osd3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma0-osd3.yaml
index 1aa659b..124033a 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma0-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma0-osd3.yaml
@@ -33,7 +33,7 @@
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_gateway: '10.11.12.1'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma3-osd3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma3-osd3.yaml
index 5fabebc..c186711 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma3-osd3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-ntw3-lma3-osd3.yaml
@@ -34,7 +34,7 @@
private_floating_network_cidr: '10.11.12.0/24'
private_floating_network_gateway: '10.11.12.1'
private_floating_network_ipam_pool_start: '10.11.12.3'
- private_floating_network_ipam_pool_end: '10.11.12.99'
+ private_floating_network_ipam_pool_end: '10.11.12.70'
control_network_ext_router_ip: '10.10.0.131'
tun_network_ext_router_ip: '10.15.0.131'
private_floating_interface: 'ens4'
diff --git a/de/heat-templates/multirack.yaml b/de/heat-templates/multirack.yaml
index 321fabd..72520d2 100644
--- a/de/heat-templates/multirack.yaml
+++ b/de/heat-templates/multirack.yaml
@@ -48,7 +48,7 @@
private_floating_network_ipam_pool_end:
type: string
description: pool end which is used as pool for IPAM and assigned to instances port
- default: '10.11.12.99'
+ default: '10.11.12.70'
private_floating_network_pool_start:
type: string
default: '10.11.12.100'
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 3f92e8b..e782161 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -710,6 +710,14 @@
addresses:
- ${PUBLIC_NODE_IP_ADDRESS}/${PUBLIC_NODE_IP_NETMASK}
EOF
+# Assign more ips for neutron dynamic routing PRODX-31417
+if [[ ${NODE_METADATA} == *"tempest"* ]]; then
+ for i in {71..76}; do
+cat << EOF >> ${cloud_netplan_cfg}
+ - ${PUBLIC_NODE_IP_ADDRESS#*.}.${i}/${PUBLIC_NODE_IP_NETMASK}
+EOF
+ done
+fi
# Remove Tunnel interface from netplan
if [[ $TUNNEL_INTERFACE_NETPLAN_MANAGE == false ]]; then
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 27cb0a7..d2c079a 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -92,7 +92,7 @@
private_floating_network_ipam_pool_end:
type: string
description: pool end which is used as pool for IPAM and assigned to instances port
- default: '10.11.12.99'
+ default: '10.11.12.70'
private_floating_network_pool_start:
type: string
default: '10.11.12.100'