commit | b104feb28b99f19f1b34d8a9c76dd62571f41db3 | [log] [tgz] |
---|---|---|
author | Tatyana Leontovich <tleontovich@mirantis.com> | Thu Apr 06 18:19:44 2017 +0300 |
committer | Tatyana Leontovich <tleontovich@mirantis.com> | Thu Apr 06 18:23:33 2017 +0300 |
tree | 1d1547a8d190ee49e34e96a7a46dc5faaed9ddf3 | |
parent | f5c0375aad0750b2f081b999c833bc85f9aae214 [diff] | |
parent | ef8014209840af29840a0481cb055bcefa0533ea [diff] |
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--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml index dc7fe5d..1013571 100644 --- a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml +++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
@@ -93,4 +93,6 @@ content: | auto ens3 iface ens3 inet dhcp + auto ens4 + iface ens4 inet dhcp
diff --git a/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml index 986194a..f181a36 100644 --- a/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml +++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
@@ -108,7 +108,7 @@ l2_network_devices: private: address_pool: private-pool01 - dhcp: true + dhcp: false forward: mode: nat