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_firewall_install.sh | 10 +++++----- vnfs/vFW/scripts/v_packetgen_install.sh | 10 +++++----- vnfs/vFW/scripts/v_sink_install.sh | 17 +++++++---------- 3 files changed, 17 insertions(+), 20 deletions(-) (limited to 'vnfs/vFW/scripts') diff --git a/vnfs/vFW/scripts/v_firewall_install.sh b/vnfs/vFW/scripts/v_firewall_install.sh index 7d178719..63ee38b0 100644 --- a/vnfs/vFW/scripts/v_firewall_install.sh +++ b/vnfs/vFW/scripts/v_firewall_install.sh @@ -5,9 +5,7 @@ DCAE_COLLECTOR_PORT=$(cat /opt/config/dcae_collector_port.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) -VFW_PRIVATE_IP_O=$(cat /opt/config/vfw_private_ip_0.txt) -VFW_PRIVATE_IP_1=$(cat /opt/config/vfw_private_ip_1.txt) -VFW_PRIVATE_IP_2=$(cat /opt/config/vfw_private_ip_2.txt) +INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) # OpenStack network configuration @@ -15,11 +13,13 @@ if [[ $CLOUD_ENV == "openstack" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + VFW_PRIVATE_IP_O=$(cat /opt/config/vfw_private_ip_0.txt) echo "auto eth1" >> /etc/network/interfaces echo "iface eth1 inet static" >> /etc/network/interfaces echo " address $VFW_PRIVATE_IP_O" >> /etc/network/interfaces echo " netmask 255.255.255.0" >> /etc/network/interfaces + VFW_PRIVATE_IP_1=$(cat /opt/config/vfw_private_ip_1.txt) echo "auto eth2" >> /etc/network/interfaces echo "iface eth2 inet static" >> /etc/network/interfaces echo " address $VFW_PRIVATE_IP_1" >> /etc/network/interfaces @@ -40,8 +40,8 @@ pip install jsonschema mkdir /opt/honeycomb cd /opt -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_firewall_init.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vfirewall.sh +wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_firewall_init.sh +wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vfirewall.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/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves_vfw_reporting/$DEMO_ARTIFACTS_VERSION/ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz 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 diff --git a/vnfs/vFW/scripts/v_sink_install.sh b/vnfs/vFW/scripts/v_sink_install.sh index c5eb120e..748545e3 100644 --- a/vnfs/vFW/scripts/v_sink_install.sh +++ b/vnfs/vFW/scripts/v_sink_install.sh @@ -3,18 +3,15 @@ PROTECTED_NET_GW=$(cat /opt/config/protected_net_gw.txt) UNPROTECTED_NET=$(cat /opt/config/unprotected_net.txt | cut -d'/' -f1) 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) -VSN_PRIVATE_IP_O=$(cat /opt/config/vsn_private_ip_0.txt) -VSN_PRIVATE_IP_1=$(cat /opt/config/vsn_private_ip_1.txt) +INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) - -# Network configuration +# OpenStack network configuration if [[ $CLOUD_ENV == "openstack" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + VSN_PRIVATE_IP_O=$(cat /opt/config/vsn_private_ip_0.txt) echo "auto eth1" >> /etc/network/interfaces echo "iface eth1 inet static" >> /etc/network/interfaces echo " address $VSN_PRIVATE_IP_O" >> /etc/network/interfaces @@ -28,15 +25,15 @@ add-apt-repository -y ppa:openjdk-r/ppa apt-get update apt-get install -y make wget openjdk-8-jdk apt-transport-https ca-certificates darkstat -# Configure and run darkstat +# Configure and run Darkstat sed -i "s/START_DARKSTAT=.*/START_DARKSTAT=yes/g" /etc/darkstat/init.cfg sed -i "s/INTERFACE=.*/INTERFACE=\"-i eth1\"/g" /etc/darkstat/init.cfg /etc/init.d/darkstat start -# Download code for virtual sink +# Download scripts for virtual sink cd /opt -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_sink_init.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vsink.sh +wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_sink_init.sh +wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vsink.sh chmod +x v_sink_init.sh chmod +x vsink.sh -- cgit 1.2.3-korg