From 366b7e2ea0e15889e3de08916c4406d98d6b509d Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Fri, 21 Apr 2017 16:52:06 -0400 Subject: vFW templates for OpenStack Change-Id: I601d534e4c8c8273df780a7d932e288193ccb541 Signed-off-by: Marco Platania --- vnfs/vFW/scripts/v_packetgen_install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vnfs/vFW/scripts/v_packetgen_install.sh') diff --git a/vnfs/vFW/scripts/v_packetgen_install.sh b/vnfs/vFW/scripts/v_packetgen_install.sh index 840e7bf8..54a26a46 100644 --- a/vnfs/vFW/scripts/v_packetgen_install.sh +++ b/vnfs/vFW/scripts/v_packetgen_install.sh @@ -6,8 +6,7 @@ SINK_IPADDR=$(cat /opt/config/sink_ipaddr.txt) REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt) REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) -VPG_PRIVATE_IP_O=$(cat /opt/config/vpg_private_ip_0.txt) -VPG_PRIVATE_IP_1=$(cat /opt/config/vpg_private_ip_1.txt) +INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) # Network configuration @@ -15,6 +14,7 @@ if [[ $CLOUD_ENV == "openstack" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + VPG_PRIVATE_IP_O=$(cat /opt/config/vpg_private_ip_0.txt) echo "auto eth1" >> /etc/network/interfaces echo "iface eth1 inet static" >> /etc/network/interfaces echo " address $VPG_PRIVATE_IP_O" >> /etc/network/interfaces @@ -34,9 +34,9 @@ pip install jsonschema mkdir /opt/honeycomb cd /opt -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_packetgen_init.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vpacketgen.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/run_traffic_fw_demo.sh +wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_packetgen_init.sh +wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vpacketgen.sh +wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/run_traffic_fw_demo.sh wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vfw/vfw_pg_streams/$DEMO_ARTIFACTS_VERSION/vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -- cgit 1.2.3-korg