Merge "Remove mgmt net router and dhcp agent"
diff --git a/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml b/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
index cf68c01..ebb1c2b 100644
--- a/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
@@ -114,28 +114,8 @@
metadata:
roles: { get_param: role }
- floating_ip:
- depends_on: [instance_instance]
- type: OS::Neutron::FloatingIP
- properties:
- floating_network: { get_param: net_public }
- port_id: { get_resource: instance_port01 }
- floating_ip_association:
- depends_on: [floating_ip]
- type: OS::Neutron::FloatingIPAssociation
- properties:
- floatingip_id: { get_resource: floating_ip }
- port_id: { get_resource: instance_port01 }
-
outputs:
- instance_floating_address:
- description: foundation node IP address (floating) from external network
- value:
- get_attr:
- - floating_ip
- - floating_ip_address
-
instance_address:
value:
get_attr:
diff --git a/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml b/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
index a461165..01e8bb4 100644
--- a/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
@@ -99,19 +99,6 @@
metadata:
roles: { get_param: role }
- floating_ip:
- depends_on: [instance_instance]
- type: OS::Neutron::FloatingIP
- properties:
- floating_network: { get_param: net_public }
- port_id: { get_resource: instance_port01 }
- floating_ip_association:
- depends_on: [floating_ip]
- type: OS::Neutron::FloatingIPAssociation
- properties:
- floatingip_id: { get_resource: floating_ip }
- port_id: { get_resource: instance_port01 }
-
outputs:
instance_address:
value:
@@ -125,10 +112,3 @@
instance:
value: { get_resource: instance_instance }
description: "Instance"
-
- instance_floating_address:
- description: CFG node IP address (floating) from external network
- value:
- get_attr:
- - floating_ip
- - floating_ip_address
diff --git a/tcp_tests/templates/_heat_environments/fragments/Subnets.yaml b/tcp_tests/templates/_heat_environments/fragments/Subnets.yaml
index 61333dd..2a248cb 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Subnets.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Subnets.yaml
@@ -36,7 +36,7 @@
# default: false
management_net_dhcp:
type: boolean
- default: true
+ default: false
management_subnet_pool_start:
type: string
management_subnet_pool_end:
@@ -101,21 +101,6 @@
tags:
- external-pool01
- router:
- type: OS::Neutron::Router
- properties:
- #name: publicbarerouter
- external_gateway_info:
- network: { get_param: net_public }
- #enable_snat: True
-
- router_subnet:
- type: OS::Neutron::RouterInterface
- depends_on: management_subnet
- properties:
- router: { get_resource: router }
- subnet: { get_resource: management_subnet }
-
outputs:
network:
value: { get_param: stack_name }