Merge branch 'add_1_0' of https://github.com/Mirantis/tcp-qa into add_1_0
diff --git a/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
index ece6e22..986194a 100644
--- a/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
@@ -18,7 +18,7 @@
env_name: {{ os_env('ENV_NAME', 'virtual-mcp10-ovs') }}
address_pools:
- admin-pool01:
+ private-pool01:
net: 172.16.10.0/24:24
params:
ip_reserved:
@@ -35,7 +35,7 @@
ip_ranges:
dhcp: [+90, -10]
- private-pool01:
+ admin-pool01:
net: 192.168.10.0/24:24
params:
ip_reserved:
@@ -163,18 +163,18 @@
interfaces:
- label: ens3
- l2_network_device: private
+ l2_network_device: admin
interface_model: *interface_model
- label: ens4
- l2_network_device: admin
+ l2_network_device: private
interface_model: *interface_model
network_config:
ens3:
networks:
- - private
+ - admin
ens4:
networks:
- - admin
+ - private
- name: {{ HOSTNAME_CTL01 }}
role: salt_minion
@@ -204,18 +204,18 @@
interfaces: &interfaces
- label: eth0
- l2_network_device: private
+ l2_network_device: admin
interface_model: *interface_model
- label: eth1
- l2_network_device: admin
+ l2_network_device: private
interface_model: *interface_model
network_config: &network_config
eth0:
networks:
- - private
+ - admin
eth1:
networks:
- - admin
+ - private
- name: {{ HOSTNAME_CTL02 }}
role: salt_minion
@@ -331,10 +331,10 @@
interfaces: &all_interfaces
- label: ens3
- l2_network_device: private
+ l2_network_device: admin
interface_model: *interface_model
- label: ens4
- l2_network_device: admin
+ l2_network_device: private
interface_model: *interface_model
- label: ens5
l2_network_device: tenant
@@ -345,10 +345,10 @@
network_config: &all_network_config
ens3:
networks:
- - private
+ - admin
ens4:
networks:
- - admin
+ - private
ens5:
networks:
- tenant