Fix all contrail templates for vsrx and runtest
Fix dns for all
Change valid gateway for vhost interface in all
Change one valid bgp vsrx router for contrail control nodes
Fix openstack.yml
Add runtest.yml
Add ctl01 to underlay
Fix nfv network for vsrx (add vlan to dpdk iface)
Change-Id: Ic31e281c3d99213add98308039c8c6d00c46fda3
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail-nfv/salt-context-cookiecutter-contrail-dpdk.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail-nfv/salt-context-cookiecutter-contrail-dpdk.yaml
index 6e0fee1..bfd683a 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail-nfv/salt-context-cookiecutter-contrail-dpdk.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail-nfv/salt-context-cookiecutter-contrail-dpdk.yaml
@@ -72,6 +72,8 @@
mcp_common_scripts_branch: ''
mcp_version: proposed
offline_deployment: 'False'
+ opencontrail_version: 3.0
+ linux_repo_contrail_component: oc32
opencontrail_analytics_address: 10.167.8.30
opencontrail_analytics_hostname: nal
opencontrail_analytics_node01_address: 10.167.8.31
@@ -80,6 +82,7 @@
opencontrail_analytics_node02_hostname: nal02
opencontrail_analytics_node03_address: 10.167.8.33
opencontrail_analytics_node03_hostname: nal03
+ opencontrail_compute_iface: enp5s0f0.${_param:tenant_vlan}
opencontrail_compute_iface_mask: '24'
opencontrail_control_address: 10.167.8.20
opencontrail_control_hostname: ntw
@@ -90,7 +93,7 @@
opencontrail_control_node03_address: 10.167.8.23
opencontrail_control_node03_hostname: ntw03
opencontrail_enabled: 'True'
- opencontrail_router01_address: 10.167.8.101
+ opencontrail_router01_address: 10.167.8.220
opencontrail_router01_hostname: rtr01
opencontrail_router02_address: 10.167.8.102
opencontrail_router02_hostname: rtr02
@@ -192,7 +195,7 @@
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
- tenant_network_gateway: 192.168.0.1
+ tenant_network_gateway: 192.168.0.220
tenant_network_netmask: 255.255.255.0
tenant_network_subnet: 192.168.0.0/24
tenant_vlan: '2423'