commit 49c30e88ffbc3490c11379473457038b3415ac23
author Tatyana Leontovich <tleontovich@mirantis.com> Mon Apr 03 16:09:47 2017 +0300
committer Tatyana Leontovich <tleontovich@mirantis.com> Mon Apr 03 17:35:35 2017 +0300
tree 1fca57e4150331e3465c9aa4f53e1d04820a2240
parent 6e52078b92ee04f797b4d91319e7d40e5c691dbb
parent 7b0ef48977f82f5c3548c273c5d6b3a5f2a8ace2

Merge branch 'add_1_0' of https://github.com/Mirantis/tcp-qa into add_1_0

tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1604.yaml

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 97b3b82..6bee6f9 100644
--- a/tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1604.yaml
@@ -82,9 +82,9 @@
 
    ########################################################
    # Node is ready, allow SSH access
-   - echo "Allow SSH access ..."
-   - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
-   ########################################################
+#   - echo "Allow SSH access ..."
+#   - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
+  ########################################################
 
   write_files:
    - path: /etc/network/interfaces

tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml

diff --git a/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml b/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml
index 377ca87..8a8ddb2 100644
--- a/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml
+++ b/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml
@@ -313,7 +313,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: eth0
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -364,7 +364,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: eth0
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150
@@ -390,7 +390,7 @@
               boot:
                 - hd
               cloud_init_volume_name: iso
-              cloud_init_iface_up: eth0
+              cloud_init_iface_up: ens3
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 150