Merge branch 'add_1_0' of https://github.com/Mirantis/tcp-qa into add_1_0
diff --git a/tcp_tests/templates/salt/virtual_mcp10_ovs.yaml b/tcp_tests/templates/salt/virtual_mcp10_ovs-salt.yaml
similarity index 100%
rename from tcp_tests/templates/salt/virtual_mcp10_ovs.yaml
rename to tcp_tests/templates/salt/virtual_mcp10_ovs-salt.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 fa95106..ea71321 100644
--- a/tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1604.yaml
@@ -41,6 +41,12 @@
- swapon /swapfile
- echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+ ########################################################
+ # Node is ready, allow SSH access
+ - echo "Allow SSH access ..."
+ - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
+ ########################################################
+
############## TCP Cloud cfg01 node ##################
#- sleep 120
- echo "Preparing base OS"
@@ -80,12 +86,6 @@
#- echo "Running complete state ..."
#- salt-call state.sls linux,openssh,salt
- ########################################################
- # Node is ready, allow SSH access
- # - echo "Allow SSH access ..."
- # - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
- ########################################################
-
write_files:
- path: /etc/network/interfaces
content: |