aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vCPE/infra
diff options
context:
space:
mode:
Diffstat (limited to 'heat/vCPE/infra')
-rw-r--r--heat/vCPE/infra/base_vcpe_infra.env3
-rw-r--r--heat/vCPE/infra/base_vcpe_infra.yaml12
2 files changed, 1 insertions, 14 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env
index d1340a40..96560f74 100644
--- a/heat/vCPE/infra/base_vcpe_infra.env
+++ b/heat/vCPE/infra/base_vcpe_infra.env
@@ -29,8 +29,7 @@ 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/staging
- demo_artifacts_version: 1.3.0
+ demo_artifacts_version: 1.3.0-SNAPSHOT
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 77935dfb..9eccf335 100644
--- a/heat/vCPE/infra/base_vcpe_infra.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra.yaml
@@ -161,10 +161,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
@@ -243,7 +239,6 @@ resources:
__oam_ipaddr__: { get_param: vaaa_private_ip_1 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
__cloud_env__ : { get_param: cloud_env }
@@ -259,7 +254,6 @@ resources:
echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt
echo "__oam_cidr__" > /opt/config/oam_cidr.txt
echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.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 "__cloud_env__" > /opt/config/cloud_env.txt
@@ -308,7 +302,6 @@ resources:
__cpe_public_net_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
__cloud_env__ : { get_param: cloud_env }
@@ -322,7 +315,6 @@ resources:
echo "__cpe_public_net_ipaddr__" > /opt/config/cpe_public_net_ipaddr.txt
echo "__oam_cidr__" > /opt/config/oam_cidr.txt
echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.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 "__cloud_env__" > /opt/config/cloud_env.txt
@@ -373,7 +365,6 @@ resources:
__cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr }
__mr_ip_addr__ : { get_param: mr_ip_addr }
__mr_ip_port__ : { get_param: mr_ip_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 }
__cloud_env__ : { get_param: cloud_env }
@@ -389,7 +380,6 @@ resources:
echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt
echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
echo "__mr_ip_port__" > /opt/config/mr_ip_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 "__cloud_env__" > /opt/config/cloud_env.txt
@@ -438,7 +428,6 @@ resources:
__cpe_public_ipaddr__: { get_param: vweb_private_ip_0 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
__cloud_env__ : { get_param: cloud_env }
@@ -452,7 +441,6 @@ resources:
echo "__cpe_public_ipaddr__" > /opt/config/cpe_public_ipaddr.txt
echo "__oam_cidr__" > /opt/config/oam_cidr.txt
echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.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 "__cloud_env__" > /opt/config/cloud_env.txt