summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--heat/vLB/base_vlb_openstack.yaml42
-rw-r--r--vnfs/vLB/scripts/v_lb_install.sh12
2 files changed, 32 insertions, 22 deletions
diff --git a/heat/vLB/base_vlb_openstack.yaml b/heat/vLB/base_vlb_openstack.yaml
index bc8affd1..fe59d7fb 100644
--- a/heat/vLB/base_vlb_openstack.yaml
+++ b/heat/vLB/base_vlb_openstack.yaml
@@ -183,17 +183,24 @@ resources:
network_id: { get_resource: vlb_private_network }
cidr: { get_param: vlb_private_net_cidr }
- vlb_private_network_for_floating:
- type: OS::Neutron::Net
- properties:
- name: { get_param: vlb_private_net_id_for_floating }
+# vlb_private_network_for_floating:
+# type: OS::Neutron::Net
+# properties:
+# name: { get_param: vlb_private_net_id_for_floating }
- vlb_private_subnet_for_floating:
- type: OS::Neutron::Subnet
- properties:
- name: { get_param: vlb_private_net_id_for_floating }
- network_id: { get_resource: vlb_private_network_for_floating }
- cidr: { get_param: vlb_private_net_cidr_for_floating }
+# vlb_private_subnet_for_floating:
+# type: OS::Neutron::Subnet
+# properties:
+# name: { get_param: vlb_private_net_id_for_floating }
+# network_id: { get_resource: vlb_private_network_for_floating }
+# network_id: { get_param: onap_private_net_id }
+# cidr: { get_param: vlb_private_net_cidr_for_floating }
+
+# router_interface:
+# type: OS::Neutron::RouterInterface
+# properties:
+# router_id: d6f7a5c3-8bae-4171-aebd-c53a8c85b2ee
+# subnet_id: { get_resource: vlb_private_subnet_for_floating }
vlb_private_0_port:
type: OS::Neutron::Port
@@ -207,17 +214,18 @@ resources:
network: { get_param: onap_private_net_id }
fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_1 }}]
- vlb_private_2_port_for_floating:
- type: OS::Neutron::Port
- properties:
- 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_private_2_port_for_floating:
+# type: OS::Neutron::Port
+# properties:
+# 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_2_port_for_floating }
+ port_id: { get_resource: vlb_private_1_port }
+# port_id: { get_resource: vlb_private_2_port_for_floating }
vlb_0:
type: OS::Nova::Server
@@ -237,6 +245,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_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 }
@@ -251,6 +260,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_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
diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh
index 8bfe9fcd..254a4753 100644
--- a/vnfs/vLB/scripts/v_lb_install.sh
+++ b/vnfs/vLB/scripts/v_lb_install.sh
@@ -17,14 +17,14 @@ then
echo " address $VLB_PRIVATE_IP_O" >> /etc/network/interfaces
echo " netmask 255.255.255.0" >> /etc/network/interfaces
- VLB_PRIVATE_IP_1=$(cat /opt/config/oam_private_ipaddr.txt)
- echo "auto eth2" >> /etc/network/interfaces
- echo "iface eth2 inet static" >> /etc/network/interfaces
- echo " address $VLB_PRIVATE_IP_1" >> /etc/network/interfaces
- echo " netmask 255.255.255.0" >> /etc/network/interfaces
+# VLB_PRIVATE_IP_1=$(cat /opt/config/oam_private_ipaddr.txt)
+# echo "auto eth2" >> /etc/network/interfaces
+# echo "iface eth2 inet static" >> /etc/network/interfaces
+# echo " address $VLB_PRIVATE_IP_1" >> /etc/network/interfaces
+# echo " netmask 255.255.255.0" >> /etc/network/interfaces
ifup eth1
- ifup eth2
+# ifup eth2
fi
# Download required dependencies