Fix heat template for E/// lab
- ipmitool has been switched to lanplus interface
MOSSUST-111
Change-Id: If722972f495728ec6cf5111a0496e57fd9f8e996
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
index b90cb1f..99c2bd9 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
@@ -45,7 +45,7 @@
default: 172.16.162.67
management_subnet_pool_end:
type: string
- default: 172.16.162.82
+ default: 172.16.162.100
salt_master_control_ip:
type: string
default: 10.167.11.5
@@ -56,17 +56,11 @@
resources:
subnets:
- type: MCP::Subnets
+ type: MCP::SubnetsE7
properties:
stack_name: { get_param: "OS::stack_name" }
env_name: { get_param: env_name }
- management_net: 'system-phys-2401'
- 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_net: 'system-phys-430'
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 }
@@ -76,32 +70,20 @@
# type: MCP::Flavors
cfg01_node:
- type: MCP::MasterNode
+ type: MCP::MasterNodeE7
depends_on: [subnets]
properties:
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
availability_zone: { get_param: bm_availability_zone }
- management_net: 'system-phys-2401'
- 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_net: 'system-phys-430'
management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
- tenant_net_static_ip:
- list_join:
- - '.'
- - [ { get_attr: [subnets, tenant_net_prefix] }, '5' ]
- external_net_static_ip:
- list_join:
- - '.'
- - [ { get_attr: [subnets, external_net_prefix] }, '5' ]
instance_name: cfg01
instance_domain: {get_param: instance_domain}
foundation_node:
- type: MCP::FoundationNode
+ type: MCP::FoundationNodeE7
depends_on: [subnets]
properties:
env_name: { get_param: env_name }
@@ -109,10 +91,7 @@
instance_domain: {get_param: instance_domain}
instance_name: foundation
availability_zone: { get_param: bm_availability_zone }
- management_net: 'system-phys-2401'
- control_net: 'system-phys-2404'
- tenant_net: 'system-phys-2406'
- external_net: 'system-phys-2403'
+ management_net: 'system-phys-430'
management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
@@ -120,19 +99,7 @@
management_net_static_ip:
list_join:
- '.'
- - [ { get_attr: [subnets, management_net_prefix] }, '62' ]
- control_net_static_ip:
- list_join:
- - '.'
- - [ { get_attr: [subnets, control_net_prefix] }, '6' ]
- tenant_net_static_ip:
- list_join:
- - '.'
- - [ { get_attr: [subnets, tenant_net_prefix] }, '6' ]
- external_net_static_ip:
- list_join:
- - '.'
- - [ { get_attr: [subnets, external_net_prefix] }, '6' ]
+ - [ { get_attr: [subnets, management_net_prefix] }, '126' ]
instance_config_host: { get_attr: [cfg01_node, instance_address] }
outputs:
foundation_public_ip: