commit 52037a4a47be9c88c2ee999bd10040da8322d73d
author Tatyana Leontovich <tleontovich@mirantis.com> Fri Apr 07 13:57:54 2017 +0300
committer Tatyana Leontovich <tleontovich@mirantis.com> Fri Apr 07 14:51:24 2017 +0300
tree 6fd7a6f3ec6f2c5d1650e313e230818294901ccf
parent b7404593b5a6575637a4c6c0074ce0a76815e470
parent f67089ee4f7044524ae27b9492da7590049d5409

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

Conflicts:
	tcp_tests/templates/underlay/mcp-fuel-aio.yaml

tcp_tests/templates/underlay/mcp-fuel-aio.yaml

diff --git a/tcp_tests/templates/underlay/mcp-fuel-aio.yaml b/tcp_tests/templates/underlay/mcp-fuel-aio.yaml
index b745825..547865c 100644
--- a/tcp_tests/templates/underlay/mcp-fuel-aio.yaml
+++ b/tcp_tests/templates/underlay/mcp-fuel-aio.yaml
@@ -23,24 +23,24 @@
             gateway: +1
             l2_network_device: +1
             default_{{ HOSTNAME_CFG01 }}: +100
-            default_{{ HOSTNAME_CTL01 }}: +101
-            default_{{ HOSTNAME_CTL02 }}: +102
-            default_{{ HOSTNAME_CTL03 }}: +103
+            default_{{ HOSTNAME_CTL01 }}: +107
+            default_{{ HOSTNAME_CTL02 }}: +108
+            default_{{ HOSTNAME_CTL03 }}: +109
             default_{{ HOSTNAME_CMP01 }}: +105
             default_{{ HOSTNAME_CMP02 }}: +106
           ip_ranges:
             dhcp: [+90, -10]
 
-      privat-pool01:
+      private-pool01:
         net: 192.168.10.0/24:24
         params:
           ip_reserved:
             gateway: +1
             l2_network_device: +1
             default_{{ HOSTNAME_CFG01 }}: +100
-            default_{{ HOSTNAME_CTL01 }}: +101
-            default_{{ HOSTNAME_CTL02 }}: +102
-            default_{{ HOSTNAME_CTL03 }}: +103
+            default_{{ HOSTNAME_CTL01 }}: +107
+            default_{{ HOSTNAME_CTL02 }}: +108
+            default_{{ HOSTNAME_CTL03 }}: +109
             default_{{ HOSTNAME_CMP01 }}: +105
             default_{{ HOSTNAME_CMP02 }}: +106
           ip_ranges: