From 2cf2f8e89f5663c2689a1f19d89f4bb11893491d Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Mon, 23 Jul 2018 11:03:18 -0400 Subject: Add URL to Nexus repo in Heat templates Change-Id: I574eb63ae1b2c57f19bd02a482ee16c65cd0b744 Issue-ID: INT-592 Signed-off-by: Marco Platania --- heat/vCPE/infra/base_vcpe_infra.env | 4 ++-- heat/vCPE/infra/base_vcpe_infra.yaml | 8 ++++++++ heat/vCPE/vbng/base_vcpe_vbng.env | 4 ++-- heat/vCPE/vbng/base_vcpe_vbng.yaml | 6 ++++++ heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env | 4 ++-- heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml | 4 ++++ heat/vCPE/vgmux/base_vcpe_vgmux.env | 4 ++-- heat/vCPE/vgmux/base_vcpe_vgmux.yaml | 2 ++ heat/vCPE/vgw/base_vcpe_vgw.env | 4 ++-- heat/vCPE/vgw/base_vcpe_vgw.yaml | 2 ++ heat/vFW/base_vfw.env | 4 ++-- heat/vFW/base_vfw.yaml | 6 ++++++ heat/vFWCL/vFWSNK/base_vfw.env | 4 ++-- heat/vFWCL/vFWSNK/base_vfw.yaml | 4 ++++ heat/vFWCL/vPKG/base_vpkg.env | 4 ++-- heat/vFWCL/vPKG/base_vpkg.yaml | 2 ++ heat/vLB/base_vlb.env | 4 ++-- heat/vLB/base_vlb.yaml | 6 ++++++ heat/vLB/dnsscaling.env | 4 ++-- heat/vLB/dnsscaling.yaml | 2 ++ heat/vLBMS/base_vlb.yaml | 10 ++++++++++ heat/vLBMS/dnsscaling.yaml | 6 ++++++ 22 files changed, 78 insertions(+), 20 deletions(-) diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env index 0691917e..d1340a40 100644 --- a/heat/vCPE/infra/base_vcpe_infra.env +++ b/heat/vCPE/infra/base_vcpe_infra.env @@ -29,8 +29,8 @@ parameters: vf_module_id: vCPE_Intrastructure dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vaaa_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE/infra/base_vcpe_infra.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml index c7d31f85..77935dfb 100644 --- a/heat/vCPE/infra/base_vcpe_infra.yaml +++ b/heat/vCPE/infra/base_vcpe_infra.yaml @@ -247,6 +247,7 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -262,6 +263,7 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -310,6 +312,7 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -323,6 +326,7 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -373,6 +377,7 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -388,6 +393,7 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -436,6 +442,7 @@ resources: __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -449,6 +456,7 @@ resources: echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env index 45592649..be6e08dd 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -24,8 +24,8 @@ sdnc_ip_addr: 10.0.7.1 dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vbng_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml index b00e2f81..aebf13f2 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.yaml +++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml @@ -173,6 +173,10 @@ parameters: type: string label: SDNC IP address description: IP address of the SDNC + nexus_artifact_repo: + type: string + description: Root URL for the Nexus repository for Maven artifacts. + default: "https://nexus.onap.org" ############# # # @@ -261,6 +265,7 @@ resources: __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag } __vpp_patch_url__ : { get_param: vpp_patch_url } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -284,6 +289,7 @@ resources: echo "__vpp_source_repo_release_tag__" > /opt/config/vpp_source_repo_release_tag.txt echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env index 7ac57ea9..052d12e0 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env @@ -14,8 +14,8 @@ vbrgemu_name_0: zdcpe1cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vbrgemu_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml index 8a737ebf..0af21ef7 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml @@ -144,6 +144,8 @@ parameters: type: string label: Compile State description: State to compile code or not + + ############# # # # RESOURCES # @@ -226,6 +228,7 @@ resources: __vpp_patch_url__ : { get_param: vpp_patch_url } __sdnc_ip__ : { get_param: sdnc_ip } __compile_state__ : { get_param: compile_state } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -245,6 +248,7 @@ resources: echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt echo "__compile_state__" > /opt/config/compile_state.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env index a2988fcb..c1f919e8 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env @@ -21,8 +21,8 @@ bng_gmux_private_ip: 10.1.0.10 dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vgmux_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml index 870f2c16..65130438 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml @@ -259,6 +259,7 @@ resources: __vpp_patch_url__ : { get_param: vpp_patch_url } __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url } __libevel_patch_url__ : { get_param: libevel_patch_url } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -283,6 +284,7 @@ resources: echo "__hc2vpp_source_repo_release_tag__" > /opt/config/hc2vpp_source_repo_release_tag.txt echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env index ea051625..c319598e 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.env +++ b/heat/vCPE/vgw/base_vcpe_vgw.env @@ -22,8 +22,8 @@ vg_vgmux_tunnel_vni: 100 dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vgw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE/vgw/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml index 890b9f44..0847b69d 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml @@ -244,6 +244,7 @@ resources: __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag } __mux_ip_addr__: { get_param: mux_ip_addr } __vg_vgmux_tunnel_vni__: { get_param: vg_vgmux_tunnel_vni } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -264,6 +265,7 @@ resources: echo "__hc2vpp_source_repo_release_tag__" > /opt/config/hc2vpp_source_repo_release_tag.txt echo "__mux_ip_addr__" > /opt/config/mux_ip_addr.txt echo "__vg_vgmux_tunnel_vni__" > /opt/config/vg_vgmux_tunnel_vni.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env index dfa09a03..a547ee4c 100644 --- a/heat/vFW/base_vfw.env +++ b/heat/vFW/base_vfw.env @@ -23,8 +23,8 @@ parameters: vf_module_id: vFirewall dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vfw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml index ebc0132e..6f2f8909 100644 --- a/heat/vFW/base_vfw.yaml +++ b/heat/vFW/base_vfw.yaml @@ -253,6 +253,7 @@ resources: __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -270,6 +271,7 @@ resources: echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -321,6 +323,7 @@ resources: __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -337,6 +340,7 @@ resources: echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -386,6 +390,7 @@ resources: __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -399,6 +404,7 @@ resources: echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env index 338a2a21..f026264a 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFWCL/vFWSNK/base_vfw.env @@ -23,8 +23,8 @@ parameters: vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR KEY HERE diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml index 0164f5b1..e75cef21 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.yaml +++ b/heat/vFWCL/vFWSNK/base_vfw.yaml @@ -255,6 +255,7 @@ resources: __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -272,6 +273,7 @@ resources: echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -321,6 +323,7 @@ resources: __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -334,6 +337,7 @@ resources: echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env index cf1a7d0c..04e8a681 100644 --- a/heat/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -16,8 +16,8 @@ parameters: vpg_name_0: zdfw1fwl01pgn01 vnf_id: vPNG_Firewall_demo_app vf_module_id: vTrafficPNG - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE diff --git a/heat/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml index 106426b2..b1f01939 100644 --- a/heat/vFWCL/vPKG/base_vpkg.yaml +++ b/heat/vFWCL/vPKG/base_vpkg.yaml @@ -195,6 +195,7 @@ resources: __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } __cloud_env__ : { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -211,6 +212,7 @@ resources: echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env index dee69cdd..70c177eb 100644 --- a/heat/vLB/base_vlb.env +++ b/heat/vLB/base_vlb.env @@ -26,8 +26,8 @@ parameters: vf_module_id: vLoadBalancer dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vlb_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vLB/base_vlb.yaml b/heat/vLB/base_vlb.yaml index 4e1459b5..6ca2538b 100644 --- a/heat/vLB/base_vlb.yaml +++ b/heat/vLB/base_vlb.yaml @@ -270,6 +270,7 @@ resources: __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr } __pktgen_mac__: { get_attr: [vpg_private_0_port, mac_address] } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -291,6 +292,7 @@ resources: echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__pktgen_mac__" > /opt/config/pktgen_mac.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -340,6 +342,7 @@ resources: __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -355,6 +358,7 @@ resources: echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -404,6 +408,7 @@ resources: __pg_int__: { get_param: pg_int } __vlb_mac__: { get_attr: [vlb_private_2_port, mac_address] } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -420,6 +425,7 @@ resources: echo "__pg_int__" > /opt/config/pg_int.txt echo "__vlb_mac__" > /opt/config/vlb_mac.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env index 130bad38..911a130d 100644 --- a/heat/vLB/dnsscaling.env +++ b/heat/vLB/dnsscaling.env @@ -14,8 +14,8 @@ parameters: vdns_name_0: zdfw1lb01dns02 vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases - demo_artifacts_version: 1.3.0-SNAPSHOT + repo_url_artifacts: https://nexus.onap.org/content/repositories/staging + demo_artifacts_version: 1.3.0 install_script_version: 1.3.0-SNAPSHOT key_name: vlb_key_scaling pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml index fd1833cc..4d5e01f0 100644 --- a/heat/vLB/dnsscaling.yaml +++ b/heat/vLB/dnsscaling.yaml @@ -185,6 +185,7 @@ resources: __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -200,6 +201,7 @@ resources: echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml index a323f23a..749bc0bb 100644 --- a/heat/vLBMS/base_vlb.yaml +++ b/heat/vLBMS/base_vlb.yaml @@ -169,6 +169,10 @@ parameters: type: string label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) + nexus_artifact_repo: + type: string + description: Root URL for the Nexus repository for Maven artifacts. + default: "https://nexus.onap.org" ############# # # @@ -274,6 +278,7 @@ resources: __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr } __pktgen_mac__: { get_attr: [vpg_private_0_port, mac_address] } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -299,6 +304,7 @@ resources: echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__pktgen_mac__" > /opt/config/pktgen_mac.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -349,6 +355,7 @@ resources: __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -365,6 +372,7 @@ resources: echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip @@ -415,6 +423,7 @@ resources: __pg_int__: { get_param: pg_int } __vlb_mac__: { get_attr: [vlb_private_2_port, mac_address] } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -432,6 +441,7 @@ resources: echo "__pg_int__" > /opt/config/pg_int.txt echo "__vlb_mac__" > /opt/config/vlb_mac.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml index c1cc3e7d..29c1010a 100644 --- a/heat/vLBMS/dnsscaling.yaml +++ b/heat/vLBMS/dnsscaling.yaml @@ -121,6 +121,10 @@ parameters: type: string label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) + nexus_artifact_repo: + type: string + description: Root URL for the Nexus repository for Maven artifacts. + default: "https://nexus.onap.org" ############# # # @@ -186,6 +190,7 @@ resources: __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -202,6 +207,7 @@ resources: echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script apt-get -y install unzip -- cgit 1.2.3-korg