commit c9f50d1f3eecc356f51aef3275671c87cddc3c0a
author sgudz <sgudz@mirantis.com> Fri May 31 14:25:34 2019 +0300
committer sgudz <sgudz@mirantis.com> Fri May 31 16:59:21 2019 +0300
tree 12efad3b396b523857e6b832c3dde22232bcce50
parent 8693d1e055c2c97cb4274f586880b5c47d16715f

Move networks settings to underlay.hot

Change-Id: Idb5287d6693fbdc358f4ddc0fb601279800d2b3c

tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot

diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
index e711b81..b7e703f 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
@@ -20,9 +20,35 @@
     type: string
   foundation_flavor:
     type: string
-
   bm_availability_zone:
     type: string
+  control_subnet_cidr:
+    type: string
+    default: "10.167.11.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.167.12.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "172.17.42.0/26"
+  management_subnet_cidr:
+    type: string
+    default: "172.16.164.0/26"
+  management_subnet_cfg01_ip:
+    type: string
+    default: 172.16.164.2
+  management_subnet_gateway_ip:
+    type: string
+    default: 172.16.164.1
+  management_subnet_pool_start:
+    type: string
+    default: 172.16.164.3
+  management_subnet_pool_end:
+    type: string
+    default: 172.16.164.61
+  salt_master_control_ip:
+    type: string
+    default: 10.167.11.15
 
 resources:
   subnets:
@@ -34,6 +60,13 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -50,6 +83,8 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -74,6 +109,7 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       instance_image: { get_param: foundation_image }
       instance_flavor: {get_param: foundation_flavor}
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }