Use dynamic IP networks for mcp-ocata-ovs/dvr models
diff --git a/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs.yaml b/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs.yaml
index 0a27a36..7967ad9 100644
--- a/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs.yaml
@@ -1,7 +1,13 @@
+{% import 'underlay/virtual-mcp-ocata-ovs--meta-data.yaml' as CLOUDINIT_META_DATA %}
+{% import 'underlay/virtual-mcp-ocata-ovs--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 %}
+{% import 'underlay/virtual-mcp-ocata-ovs--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 %}
+
---
aliases:
- default_interface_model:
- - &interface_model !os_env INTERFACE_MODEL, virtio
+ - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
+ - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
+ - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
+ - &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
{% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'virtual-mcp-ocata-ovs') + '.local' %}
{% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
@@ -19,7 +25,7 @@
address_pools:
private-pool01:
- net: 172.16.10.0/24:24
+ net: {{ os_env('PRIVATE_ADDRESS_POOL01', '10.60.0.0/16:24') }}
params:
ip_reserved:
gateway: +1
@@ -36,7 +42,7 @@
dhcp: [+90, -10]
admin-pool01:
- net: 192.168.10.0/24:24
+ net: {{ os_env('ADMIN_ADDRESS_POOL01', '10.70.0.0/16:24') }}
params:
ip_reserved:
gateway: +1
@@ -53,7 +59,7 @@
dhcp: [+90, -10]
tenant-pool01:
- net: 10.1.0.0/24:24
+ net: {{ os_env('TENANT_ADDRESS_POOL01', '10.80.0.0/16:24') }}
params:
ip_reserved:
gateway: +1
@@ -70,7 +76,7 @@
dhcp: [+10, -10]
external-pool01:
- net: 10.16.0.0/24:24
+ net: {{ os_env('EXTERNAL_ADDRESS_POOL01', '10.90.0.0/16:24') }}
params:
ip_reserved:
gateway: +1
@@ -154,8 +160,8 @@
format: raw
device: cdrom
bus: ide
- cloudinit_meta_data: !include virtual-mcp-ocata-ovs--meta-data.yaml
- cloudinit_user_data: !include virtual-mcp-ocata-ovs--user-data-cfg01.yaml
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_cfg01
interfaces:
- label: ens3
@@ -195,8 +201,8 @@
format: raw
device: cdrom
bus: ide
- cloudinit_meta_data: !include virtual-mcp-ocata-ovs--meta-data.yaml
- cloudinit_user_data: !include virtual-mcp-ocata-ovs--user-data1604.yaml
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_1604
interfaces: &interfaces
- label: ens3
@@ -236,8 +242,8 @@
format: raw
device: cdrom
bus: ide
- cloudinit_meta_data: !include virtual-mcp-ocata-ovs--meta-data.yaml
- cloudinit_user_data: !include virtual-mcp-ocata-ovs--user-data1604.yaml
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_1604
interfaces: *interfaces
network_config: *network_config
@@ -265,8 +271,8 @@
format: raw
device: cdrom
bus: ide
- cloudinit_meta_data: !include virtual-mcp-ocata-ovs--meta-data.yaml
- cloudinit_user_data: !include virtual-mcp-ocata-ovs--user-data1604.yaml
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_1604
interfaces: *interfaces
network_config: *network_config
@@ -294,8 +300,8 @@
format: raw
device: cdrom
bus: ide
- cloudinit_meta_data: !include virtual-mcp-ocata-ovs--meta-data.yaml
- cloudinit_user_data: !include virtual-mcp-ocata-ovs--user-data1604.yaml
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_1604
interfaces: *interfaces
network_config: *network_config
@@ -321,8 +327,8 @@
format: raw
device: cdrom
bus: ide
- cloudinit_meta_data: !include virtual-mcp-ocata-ovs--meta-data.yaml
- cloudinit_user_data: !include virtual-mcp-ocata-ovs--user-data1604.yaml
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_1604
interfaces: &all_interfaces
@@ -372,8 +378,8 @@
format: raw
device: cdrom
bus: ide
- cloudinit_meta_data: !include virtual-mcp-ocata-ovs--meta-data.yaml
- cloudinit_user_data: !include virtual-mcp-ocata-ovs--user-data1604.yaml
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_1604
interfaces: *all_interfaces
network_config: *all_network_config
@@ -398,8 +404,8 @@
format: raw
device: cdrom
bus: ide
- cloudinit_meta_data: !include virtual-mcp-ocata-ovs--meta-data.yaml
- cloudinit_user_data: !include virtual-mcp-ocata-ovs--user-data1604.yaml
+ cloudinit_meta_data: *cloudinit_meta_data
+ cloudinit_user_data: *cloudinit_user_data_1604
interfaces: *all_interfaces
network_config: *all_network_config