Revert "[vsrx] Allocate public floating ip"
This reverts commit b3a699dc48777406b1553dde9d54b406938bbb2b.
Reason for revert: PRODX-11809
Change-Id: Ic498545722ac123b0440662cef8331208ef6ad25
diff --git a/de/heat-templates/fragments/NetworkPrvFl.yaml b/de/heat-templates/fragments/NetworkPrvFl.yaml
index 7b3bb9a..5519508 100644
--- a/de/heat-templates/fragments/NetworkPrvFl.yaml
+++ b/de/heat-templates/fragments/NetworkPrvFl.yaml
@@ -26,8 +26,6 @@
vsrx_flavor:
type: string
default: oc_vsrx
- public_net_id:
- type: string
resources:
diff --git a/de/heat-templates/fragments/NetworkPrvFlVSRX.yaml b/de/heat-templates/fragments/NetworkPrvFlVSRX.yaml
index 4f60e07..7522b83 100644
--- a/de/heat-templates/fragments/NetworkPrvFlVSRX.yaml
+++ b/de/heat-templates/fragments/NetworkPrvFlVSRX.yaml
@@ -23,8 +23,6 @@
vsrx_flavor:
type: string
default: oc_vsrx
- public_net_id:
- type: string
resources:
@@ -67,12 +65,6 @@
fixed_ips:
- ip_address: { get_param: data_network_vsrx_ip}
- server_floating_ip:
- type: OS::Neutron::FloatingIP
- properties:
- floating_network_id: { get_param: public_net_id }
- port_id: { get_resource: accessible_server_port }
-
vsrx_instance:
type: OS::Nova::Server
properties:
@@ -90,6 +82,3 @@
value: { get_resource: network }
private_floating_subnet_id:
value: { get_resource: subnet }
- server_public_ip:
- description: Floating IP address of server in public network
- value: { get_attr: [ server_floating_ip, floating_ip_address ] }
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 4d472c1..2d83383 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -347,7 +347,6 @@
tun_network: { get_attr: [tun_network, tun_network_id] }
vsrx_image: { get_param: vsrx_image }
vsrx_flavor: { get_param: vsrx_flavor }
- public_net_id: { get_param: public_net_id }
storage_network:
type: MCP2::NetworkAccStorage
@@ -972,6 +971,3 @@
data_network_vsrx_ip:
description: IP address of vsrx in tungsten fabric data network
value: { get_param: data_network_vsrx_ip }
- public_network_vsrx_ip:
- description: IP address of vsrx in tungsten fabric public network
- value: { get_attr: [private_floating_network, server_public_ip] }