From 7270048fdaa4409349b4ee0c4775dfecd544de1f Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Mon, 24 Apr 2017 09:26:03 -0400 Subject: [PATCH] fix issue with artifacts version in vFW Change-Id: I8bec217e5813924de4ce17dc19dcb5c704917471 Signed-off-by: Marco Platania --- heat/vFW/base_vfw_rackspace.env | 12 +++++++----- vnfs/vFW/scripts/v_firewall_init.sh | 2 +- vnfs/vFW/scripts/v_firewall_install.sh | 4 +--- vnfs/vFW/scripts/v_packetgen_init.sh | 2 +- vnfs/vFW/scripts/v_packetgen_install.sh | 5 +---- vnfs/vFW/scripts/v_sink_init.sh | 2 +- vnfs/vFW/scripts/v_sink_install.sh | 2 -- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/heat/vFW/base_vfw_rackspace.env b/heat/vFW/base_vfw_rackspace.env index 23aa18c8..34c551f6 100644 --- a/heat/vFW/base_vfw_rackspace.env +++ b/heat/vFW/base_vfw_rackspace.env @@ -4,11 +4,11 @@ parameters: public_net_id: 00000000-0000-0000-0000-000000000000 unprotected_private_net_id: zdfw1fwl01_unprotected protected_private_net_id: zdfw1fwl01_protected - ecomp_private_net_id: oam_ecomp - ecomp_private_subnet_id: oam_ecomp + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE unprotected_private_net_cidr: 192.168.10.0/24 protected_private_net_cidr: 192.168.20.0/24 - ecomp_private_net_cidr: 10.0.0.0/8 + onap_private_net_cidr: 10.0.0.0/8 vfw_private_ip_0: 192.168.10.100 vfw_private_ip_1: 192.168.20.100 vfw_private_ip_2: 10.1.0.1 @@ -24,7 +24,9 @@ parameters: dcae_collector_ip: 10.0.4.102 dcae_collector_port: 8080 repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/repositories/snapshots - demo_artifacts_version: 1.1.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/groups/staging + demo_artifacts_version: 1.1.0 + install_script_version: 1.1.0-SNAPSHOT key_name: vfw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN + cloud_env: rackspace diff --git a/vnfs/vFW/scripts/v_firewall_init.sh b/vnfs/vFW/scripts/v_firewall_init.sh index 54928072..d277af04 100644 --- a/vnfs/vFW/scripts/v_firewall_init.sh +++ b/vnfs/vFW/scripts/v_firewall_init.sh @@ -37,7 +37,7 @@ ifconfig br1 up sleep 1 # Start HoneyComb -VERSION=$(cat /opt/config/artifacts_version.txt) +VERSION=$(cat /opt/config/demo_artifacts_version.txt) echo "" > /var/lib/honeycomb/persist/context/data.json echo "" > /var/lib/honeycomb/persist/config/data.json /opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown diff --git a/vnfs/vFW/scripts/v_firewall_install.sh b/vnfs/vFW/scripts/v_firewall_install.sh index 63ee38b0..d1d552b2 100644 --- a/vnfs/vFW/scripts/v_firewall_install.sh +++ b/vnfs/vFW/scripts/v_firewall_install.sh @@ -1,14 +1,12 @@ #!/bin/bash -DCAE_COLLECTOR_IP=$(cat /opt/config/dcae_collector_ip.txt) -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) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) -# OpenStack network configuration +# OpenStack network configuration if [[ $CLOUD_ENV == "openstack" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts diff --git a/vnfs/vFW/scripts/v_packetgen_init.sh b/vnfs/vFW/scripts/v_packetgen_init.sh index 3bbe02f2..ca6571b7 100644 --- a/vnfs/vFW/scripts/v_packetgen_init.sh +++ b/vnfs/vFW/scripts/v_packetgen_init.sh @@ -50,7 +50,7 @@ vppctl exec /opt/pg_streams/stream_fw_udp10 sleep 1 # Start HoneyComb -VERSION=$(cat /opt/config/artifacts_version.txt) +VERSION=$(cat /opt/config/demo_artifacts_version.txt) echo "" > /var/lib/honeycomb/persist/context/data.json echo "" > /var/lib/honeycomb/persist/config/data.json /opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown diff --git a/vnfs/vFW/scripts/v_packetgen_install.sh b/vnfs/vFW/scripts/v_packetgen_install.sh index 54a26a46..8f8537cd 100644 --- a/vnfs/vFW/scripts/v_packetgen_install.sh +++ b/vnfs/vFW/scripts/v_packetgen_install.sh @@ -1,15 +1,12 @@ #!/bin/bash -FW_IPADDR=$(cat /opt/config/fw_ipaddr.txt) -PROTECTED_NET_CIDR=$(cat /opt/config/protected_net_cidr.txt) -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) 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 diff --git a/vnfs/vFW/scripts/v_sink_init.sh b/vnfs/vFW/scripts/v_sink_init.sh index 16a67508..77f4296c 100644 --- a/vnfs/vFW/scripts/v_sink_init.sh +++ b/vnfs/vFW/scripts/v_sink_init.sh @@ -2,6 +2,6 @@ # Set the IP address of the protected network interface of the vFirewall as a default gateway to the unprotected network PROTECTED_NET_GW=$(cat /opt/config/protected_net_gw.txt) -UNPROTECTED_NET=$(cat /opt/config/unprotected_net.txt) +UNPROTECTED_NET=$(cat /opt/config/unprotected_net.txt | cut -d'/' -f1) route add -net $UNPROTECTED_NET netmask 255.255.255.0 gw $PROTECTED_NET_GW diff --git a/vnfs/vFW/scripts/v_sink_install.sh b/vnfs/vFW/scripts/v_sink_install.sh index 748545e3..686fd3ae 100644 --- a/vnfs/vFW/scripts/v_sink_install.sh +++ b/vnfs/vFW/scripts/v_sink_install.sh @@ -1,7 +1,5 @@ #!/bin/bash -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) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) -- 2.16.6