Merge "Supports 3rd party json for measurements"

[demo.git] / heat / vLBMS / base_vlb.yaml

diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml
index e0f71ff..b04feb7 100644 (file)
--- a/heat/vLBMS/base_vlb.yaml
+++ b/heat/vLBMS/base_vlb.yaml
@@ -259,9 +259,11 @@ resources:
             __ip_to_dns_net__: { get_param: vlb_private_ip_0 }
             __ip_to_pktgen_net__: { get_param: vlb_private_ip_2 }
             __oam_vpktgen_ip__: { get_param: vpg_private_ip_1 }
+            __oam_vdns_ip__: { get_param: vdns_private_ip_1 }
             __vip__: { get_param: vip }
             __gre_ipaddr__: { get_param: gre_ipaddr }
             __pktgen_ipaddr__: { get_param: vpg_private_ip_0 }
+            __vdns_ipaddr__: { get_param: vdns_private_ip_0 }
             __oam_private_ipaddr__: { get_param: vlb_private_ip_1 }
             __repo_url_blob__: { get_param: repo_url_blob }
             __repo_url_artifacts__: { get_param: repo_url_artifacts }
@@ -282,9 +284,11 @@ resources:
             echo "__ip_to_dns_net__" > /opt/config/ip_to_dns_net.txt
             echo "__ip_to_pktgen_net__" > /opt/config/ip_to_pktgen_net.txt
             echo "__oam_vpktgen_ip__" > /opt/config/oam_vpktgen_ip.txt
+            echo "__oam_vdns_ip__" > /opt/config/oam_vdns_ip.txt
             echo "__vip__" > /opt/config/vip.txt
             echo "__gre_ipaddr__" > /opt/config/gre_ipaddr.txt
             echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt
+            echo "__vdns_ipaddr__" > /opt/config/vdns_ipaddr.txt
             echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
             echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
             echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
@@ -297,7 +301,7 @@ resources:
             echo "__cloud_env__" > /opt/config/cloud_env.txt
 
             # Download and run install script
-            curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh
+            curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh
             cd /opt
             chmod +x v_lb_install.sh
             ./v_lb_install.sh
@@ -333,7 +337,7 @@ resources:
           params:
             __lb_oam_int__: { get_param: vlb_private_ip_1 }
             __lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
-            __lb_public_ipaddr__: { get_attr: [vlb_0, networks, { get_param: public_net_id }, 0]}
+            __lb_to_pktgen_if__: { get_param: vlb_private_ip_2}
             __local_private_ipaddr__: { get_param: vdns_private_ip_0 }
             __oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
             __repo_url_blob__: { get_param: repo_url_blob }
@@ -350,7 +354,7 @@ resources:
             mkdir /opt/config
             echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt
             echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt
-            echo "__lb_public_ipaddr__" > /opt/config/lb_public_ipaddr.txt
+            echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.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
@@ -362,7 +366,7 @@ resources:
             echo "__cloud_env__" > /opt/config/cloud_env.txt
 
             # Download and run install script
-            curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+            curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
             cd /opt
             chmod +x v_dns_install.sh
             ./v_dns_install.sh
@@ -426,7 +430,7 @@ resources:
             echo "__cloud_env__" > /opt/config/cloud_env.txt
 
             # Download and run install script
-            curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
+            curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
             cd /opt
             chmod +x v_packetgen_install.sh
             ./v_packetgen_install.sh
\ No newline at end of file