diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-08-28 11:48:14 -0700 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-08-29 10:42:32 -0700 |
commit | a0081c9434b6ef4b43ef29af01b1f1f06dcc0b25 (patch) | |
tree | d8f2d0c65032858416c1bf423ff050d877901b76 /heat/vFWCL/vPKG | |
parent | 0ad71d0595d732590aed545cf972f28627b12d64 (diff) |
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 <gary.i.wu@huawei.com>
Diffstat (limited to 'heat/vFWCL/vPKG')
-rw-r--r-- | heat/vFWCL/vPKG/base_vpkg.env | 3 | ||||
-rw-r--r-- | heat/vFWCL/vPKG/base_vpkg.yaml | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env index 080d02f9..4c81d4be 100644 --- a/heat/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -16,8 +16,7 @@ parameters: vpg_name_0: zdfw1fwl01pgn01 vnf_id: vPNG_Firewall_demo_app vf_module_id: vTrafficPNG - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT 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 62d405a7..6d1902ba 100644 --- a/heat/vFWCL/vPKG/base_vpkg.yaml +++ b/heat/vFWCL/vPKG/base_vpkg.yaml @@ -109,10 +109,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 @@ -194,7 +190,6 @@ resources: __fw_ipaddr__: { get_param: vfw_private_ip_0 } __protected_net_cidr__: { get_param: protected_private_net_cidr } __sink_ipaddr__: { get_param: vsn_private_ip_0 } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 } @@ -211,7 +206,6 @@ resources: echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt |