summaryrefslogtreecommitdiffstats
path: root/heat/vLB
diff options
context:
space:
mode:
Diffstat (limited to 'heat/vLB')
-rw-r--r--heat/vLB/base_vlb.env3
-rw-r--r--heat/vLB/base_vlb.yaml10
-rw-r--r--heat/vLB/dnsscaling.env3
-rw-r--r--heat/vLB/dnsscaling.yaml6
4 files changed, 2 insertions, 20 deletions
diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env
index fecfc520..db302b63 100644
--- a/heat/vLB/base_vlb.env
+++ b/heat/vLB/base_vlb.env
@@ -26,8 +26,7 @@ parameters:
vf_module_id: vLoadBalancer
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: vlb_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/base_vlb.yaml b/heat/vLB/base_vlb.yaml
index 0d8c575a..d57f5afa 100644
--- a/heat/vLB/base_vlb.yaml
+++ b/heat/vLB/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
@@ -273,7 +269,6 @@ resources:
__gre_ipaddr__: { get_param: gre_ipaddr }
__pktgen_ipaddr__: { get_param: vpg_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 }
__install_script_version__: { get_param: install_script_version }
__vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
@@ -295,7 +290,6 @@ resources:
echo "__gre_ipaddr__" > /opt/config/gre_ipaddr.txt
echo "__pktgen_ipaddr__" > /opt/config/pktgen_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 "__install_script_version__" > /opt/config/install_script_version.txt
echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
@@ -352,7 +346,6 @@ resources:
__lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
__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 }
__demo_artifacts_version__: { get_param: demo_artifacts_version }
__install_script_version__: { get_param: install_script_version }
__vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
@@ -368,7 +361,6 @@ resources:
echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.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 "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
@@ -417,7 +409,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 }
@@ -439,7 +430,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 "__install_script_version__" > /opt/config/install_script_version.txt
echo "__pg_int__" > /opt/config/pg_int.txt
diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env
index 62e65935..ed69dca5 100644
--- a/heat/vLB/dnsscaling.env
+++ b/heat/vLB/dnsscaling.env
@@ -14,8 +14,7 @@ parameters:
vdns_name_0: zdfw1lb01dns02
vnf_id: vLoadBalancer_demo_app
vf_module_id: vLoadBalancer
- 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: vlb_key_scaling
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml
index 69444fe7..0d22f804 100644
--- a/heat/vLB/dnsscaling.yaml
+++ b/heat/vLB/dnsscaling.yaml
@@ -101,10 +101,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
@@ -187,7 +183,6 @@ resources:
__lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
__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 }
__demo_artifacts_version__: { get_param: demo_artifacts_version }
__install_script_version__: { get_param: install_script_version }
__vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
@@ -203,7 +198,6 @@ resources:
echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.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 "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt