aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vFWCL/vFWSNK
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-28 11:48:14 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-29 10:42:32 -0700
commita0081c9434b6ef4b43ef29af01b1f1f06dcc0b25 (patch)
treed8f2d0c65032858416c1bf423ff050d877901b76 /heat/vFWCL/vFWSNK
parent0ad71d0595d732590aed545cf972f28627b12d64 (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/vFWSNK')
-rw-r--r--heat/vFWCL/vFWSNK/base_vfw.env3
-rw-r--r--heat/vFWCL/vFWSNK/base_vfw.yaml7
2 files changed, 1 insertions, 9 deletions
diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env
index 83d90f28..c0a53d1f 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.env
+++ b/heat/vFWCL/vFWSNK/base_vfw.env
@@ -23,8 +23,7 @@ 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/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 KEY HERE
diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml
index 73b2c2a5..116ee9fb 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.yaml
+++ b/heat/vFWCL/vFWSNK/base_vfw.yaml
@@ -137,10 +137,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
@@ -254,7 +250,6 @@ resources:
params:
__dcae_collector_ip__ : { get_param: dcae_collector_ip }
__dcae_collector_port__ : { get_param: dcae_collector_port }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
__vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }
@@ -272,7 +267,6 @@ resources:
mkdir /opt/config
echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.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 "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt
@@ -329,7 +323,6 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_private_ip_1 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
__install_script_version__ : { get_param: install_script_version }
__vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
__vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }