From a0081c9434b6ef4b43ef29af01b1f1f06dcc0b25 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 28 Aug 2018 11:48:14 -0700 Subject: Retrieve demo artifacts via nexus REST API This supports the use of SNAPSHOT demo artifacts in the vnf HEAT templates. Change-Id: I980c879819b1a396c985c7a2af1885b28e4f150a Issue-ID: INT-592 Signed-off-by: Gary Wu --- heat/vLBMS/base_vlb.env | 3 +-- heat/vLBMS/base_vlb.yaml | 10 ---------- heat/vLBMS/dnsscaling.env | 1 - heat/vLBMS/dnsscaling.yaml | 6 ------ 4 files changed, 1 insertion(+), 19 deletions(-) (limited to 'heat/vLBMS') diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env index d41fa184..6b485307 100644 --- a/heat/vLBMS/base_vlb.env +++ b/heat/vLBMS/base_vlb.env @@ -26,9 +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/groups/staging nb_api_version: 1.2.0 - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT 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/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml index ca3db36c..f3d5f1c8 100644 --- a/heat/vLBMS/base_vlb.yaml +++ b/heat/vLBMS/base_vlb.yaml @@ -149,10 +149,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages demo_artifacts_version: type: string label: Artifacts version used in demo vnfs @@ -278,7 +274,6 @@ resources: __pktgen_ipaddr__: { get_param: vpg_private_ip_0 } __vdns_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vlb_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __demo_artifacts_version__: { get_param: demo_artifacts_version } __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } @@ -304,7 +299,6 @@ resources: echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt echo "__vdns_ipaddr__" > /opt/config/vdns_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__nb_api_version__" > /opt/config/nb_api_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt @@ -362,7 +356,6 @@ resources: __lb_to_pktgen_if__: { get_param: vlb_private_ip_2} __local_private_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } @@ -379,7 +372,6 @@ resources: echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__nb_api_version__" > /opt/config/nb_api_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt @@ -428,7 +420,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__: { get_param: repo_url_artifacts } __local_private_ipaddr__: { get_param: vpg_private_ip_0 } __oam_private_ipaddr__: { get_param: vpg_private_ip_1 } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } @@ -451,7 +442,6 @@ resources: echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__nb_api_version__" > /opt/config/nb_api_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env index 355ffd68..ffdf44e8 100644 --- a/heat/vLBMS/dnsscaling.env +++ b/heat/vLBMS/dnsscaling.env @@ -15,7 +15,6 @@ parameters: vdns_name_0: zdfw1lb01dns02 vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer - repo_url_artifacts: https://nexus.onap.org/content/groups/staging nb_api_version: 1.2.0 install_script_version: 1.3.0-SNAPSHOT key_name: vlb_key_scaling diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml index f0a9a2d5..a3707bfb 100644 --- a/heat/vLBMS/dnsscaling.yaml +++ b/heat/vLBMS/dnsscaling.yaml @@ -105,10 +105,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages install_script_version: type: string label: Installation script version number @@ -191,7 +187,6 @@ resources: __lb_to_pktgen_if__: { get_param: vlb_private_ip_2} __local_private_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } @@ -208,7 +203,6 @@ resources: echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__nb_api_version__" > /opt/config/nb_api_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt -- cgit 1.2.3-korg