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/vCPE_build/vbng/build_vcpe_vbng.env | 3 +-- heat/vCPE_build/vbng/build_vcpe_vbng.yaml | 6 ------ heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env | 3 +-- heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml | 6 ------ heat/vCPE_build/vgmux/build_vcpe_vgmux.env | 3 +-- heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml | 6 ------ heat/vCPE_build/vgw/build_vcpe_vgw.env | 3 +-- heat/vCPE_build/vgw/build_vcpe_vgw.yaml | 6 ------ 8 files changed, 4 insertions(+), 32 deletions(-) (limited to 'heat/vCPE_build') diff --git a/heat/vCPE_build/vbng/build_vcpe_vbng.env b/heat/vCPE_build/vbng/build_vcpe_vbng.env index ba9a2c40..8b9f88ce 100644 --- a/heat/vCPE_build/vbng/build_vcpe_vbng.env +++ b/heat/vCPE_build/vbng/build_vcpe_vbng.env @@ -5,8 +5,7 @@ vbng_name_0: zdcpe1cpe01bng01 vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app vf_module_id: vCPE_Intrastructure_Metro_vBNG - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT 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_build/vbng/build_vcpe_vbng.yaml b/heat/vCPE_build/vbng/build_vcpe_vbng.yaml index 59cc2911..0822185d 100644 --- a/heat/vCPE_build/vbng/build_vcpe_vbng.yaml +++ b/heat/vCPE_build/vbng/build_vcpe_vbng.yaml @@ -65,10 +65,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 script_version: type: string label: Build script version number @@ -143,7 +139,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -157,7 +152,6 @@ resources: # Create configuration files mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env index be905dc8..f389085b 100644 --- a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env +++ b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env @@ -5,8 +5,7 @@ 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/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT 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_build/vbrgemu/build_vcpe_vbrgemu.yaml b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml index e176747f..d49b07f4 100644 --- a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml +++ b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml @@ -67,10 +67,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 script_version: type: string label: Build script version number @@ -152,7 +148,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -168,7 +163,6 @@ resources: # Create configuration files mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE_build/vgmux/build_vcpe_vgmux.env b/heat/vCPE_build/vgmux/build_vcpe_vgmux.env index 47863acd..9a38f38b 100644 --- a/heat/vCPE_build/vgmux/build_vcpe_vgmux.env +++ b/heat/vCPE_build/vgmux/build_vcpe_vgmux.env @@ -7,8 +7,7 @@ vf_module_id: vCPE_Intrastructure_Metro_vGMUX dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT 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_build/vgmux/build_vcpe_vgmux.yaml b/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml index f7d843d7..8d23e173 100644 --- a/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml +++ b/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml @@ -73,10 +73,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 script_version: type: string label: Script version number @@ -169,7 +165,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -187,7 +182,6 @@ resources: # Create configuration files mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE_build/vgw/build_vcpe_vgw.env b/heat/vCPE_build/vgw/build_vcpe_vgw.env index def032f5..adcf0994 100644 --- a/heat/vCPE_build/vgw/build_vcpe_vgw.env +++ b/heat/vCPE_build/vgw/build_vcpe_vgw.env @@ -7,8 +7,7 @@ vf_module_id: vCPE_Customer_GW dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT 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_build/vgw/build_vcpe_vgw.yaml b/heat/vCPE_build/vgw/build_vcpe_vgw.yaml index 3bd8532b..968f157a 100644 --- a/heat/vCPE_build/vgw/build_vcpe_vgw.yaml +++ b/heat/vCPE_build/vgw/build_vcpe_vgw.yaml @@ -73,10 +73,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 script_version: type: string label: Script version number @@ -157,7 +153,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -172,7 +167,6 @@ resources: # Create configuration files mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt -- cgit 1.2.3-korg