diff options
| author |   Marco Platania <platania@research.att.com> | 2017-10-10 00:53:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-10 00:53:00 +0000 |
| commit | 864898b6eb1ef1b037491944f3923ac69da0b5cd (patch) | |
| tree | 8ca45d7d4271dc4e192db49cb38c092909608591 | |
| parent | 39f6d03b7224b4f7f166bbf9d4fd9f118329d5e0 (diff) | |
| parent | 8d797333b68beb9b462be5767dc558290001f031 (diff) | |
Merge "Fix patch URLs for vCPE use case and other fixes"
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.env | 2 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env | 2 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux.env | 6 | ||||
| -rw-r--r-- | vnfs/vCPE/scripts/v_gmux_install.sh | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env index f79d306e..be4f9728 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -32,4 +32,4 @@ cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) vpp_source_repo_url: https://gerrit.fd.io/r/vpp vpp_source_repo_branch: stable/1704 - vpp_patch_url: https://gerrit.onap.org/r/#/c/11083/5/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch + vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env index 47b66c6d..ea8bc823 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env @@ -24,4 +24,4 @@ vpp_source_repo_branch: stable/1704 hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp hc2vpp_source_repo_branch: stable/1704 - vpp_patch_url: https://gerrit.onap.org/r/#/c/11083/5/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch + vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env index 3be62673..aad4784b 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env @@ -23,12 +23,12 @@ 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: vbng_key + key_name: vgmux_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) vpp_source_repo_url: https://gerrit.fd.io/r/vpp vpp_source_repo_branch: stable/1704 hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp hc2vpp_source_repo_branch: stable/1704 - vpp_patch_url: https://gerrit.onap.org/r/#/c/11083/5/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch - hc2vpp_patch_url: https://gerrit.onap.org/r/#/c/11083/5/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch + vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch + hc2vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch diff --git a/vnfs/vCPE/scripts/v_gmux_install.sh b/vnfs/vCPE/scripts/v_gmux_install.sh index 9ab81403..b52179d6 100644 --- a/vnfs/vCPE/scripts/v_gmux_install.sh +++ b/vnfs/vCPE/scripts/v_gmux_install.sh @@ -227,6 +227,7 @@ git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp wget -O Hc2vpp-Add-VES-agent-for-vG-MUX.patch ${HC2VPP_PATCH_URL} apt-get install -y maven +mkdir -p ~/.m2 cat > ~/.m2/settings.xml << EOF <?xml version="1.0" encoding="UTF-8"?> <!-- vi: set et smarttab sw=2 tabstop=2: --> |