summaryrefslogtreecommitdiffstats
path: root/heat/vLB
diff options
context:
space:
mode:
Diffstat (limited to 'heat/vLB')
-rw-r--r--heat/vLB/base_vlb_openstack.yaml23
1 files changed, 14 insertions, 9 deletions
diff --git a/heat/vLB/base_vlb_openstack.yaml b/heat/vLB/base_vlb_openstack.yaml
index fe59d7fb..672c44c9 100644
--- a/heat/vLB/base_vlb_openstack.yaml
+++ b/heat/vLB/base_vlb_openstack.yaml
@@ -201,6 +201,7 @@ resources:
# properties:
# router_id: d6f7a5c3-8bae-4171-aebd-c53a8c85b2ee
# subnet_id: { get_resource: vlb_private_subnet_for_floating }
+# subnet_id: { get_param: onap_private_subnet_id }
vlb_private_0_port:
type: OS::Neutron::Port
@@ -220,11 +221,11 @@ resources:
# network: { get_param: onap_private_net_id }
# fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_2_for_floating }}]
- vlb_floating_ip:
- type: OS::Neutron::FloatingIP
- properties:
- floating_network_id: { get_param: public_net_id }
- port_id: { get_resource: vlb_private_1_port }
+# vlb_floating_ip:
+# type: OS::Neutron::FloatingIP
+# properties:
+# floating_network_id: { get_param: public_net_id }
+# port_id: { get_resource: vlb_private_1_port }
# port_id: { get_resource: vlb_private_2_port_for_floating }
vlb_0:
@@ -235,7 +236,10 @@ resources:
name: { get_param: vlb_name_0 }
key_name: { get_resource: my_keypair }
networks:
- - port: { get_resource: vlb_private_2_port_for_floating }
+# - port: { get_resource: vlb_private_2_port_for_floating }
+# - port: { get_resource: vlb_private_0_port }
+# - port: { get_resource: vlb_private_1_port }
+ - network: { get_param: public_net_id }
- port: { get_resource: vlb_private_0_port }
- port: { get_resource: vlb_private_1_port }
metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
@@ -245,7 +249,7 @@ resources:
params:
__dcae_collector_ip__: { get_param: dcae_collector_ip }
__dcae_collector_port__: { get_param: dcae_collector_port }
- __local_public_ipaddr__: { get_attr: [vlb_floating_ip, floating_ip_address] }
+ #__local_public_ipaddr__: { get_attr: [vlb_floating_ip, floating_ip_address] }
__local_private_ipaddr__: { get_param: vlb_private_ip_0 }
__oam_private_ipaddr__: { get_param: vlb_private_ip_1 }
__repo_url_blob__ : { get_param: repo_url_blob }
@@ -260,7 +264,7 @@ resources:
mkdir /opt/config
echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt
- echo "__local_public_ipaddr__" > /opt/config/local_public_ipaddr.txt
+ #echo "__local_public_ipaddr__" > /opt/config/local_public_ipaddr.txt
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
@@ -302,8 +306,9 @@ resources:
name: { get_param: vdns_name_0 }
key_name: { get_resource: my_keypair }
networks:
- - port: { get_resource: vdns_private_1_port }
+ - network: { get_param: public_net_id }
- port: { get_resource: vdns_private_0_port }
+ - port: { get_resource: vdns_private_1_port }
metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
user_data_format: RAW
user_data: