aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vLBMS
diff options
context:
space:
mode:
Diffstat (limited to 'heat/vLBMS')
-rw-r--r--heat/vLBMS/base_vlb.env3
-rw-r--r--heat/vLBMS/base_vlb.yaml25
-rw-r--r--heat/vLBMS/dnsscaling.env3
-rw-r--r--heat/vLBMS/dnsscaling.yaml11
4 files changed, 18 insertions, 24 deletions
diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env
index a447bc20..32b88474 100644
--- a/heat/vLBMS/base_vlb.env
+++ b/heat/vLBMS/base_vlb.env
@@ -26,11 +26,10 @@ parameters:
vf_module_id: vLoadBalancer
dcae_collector_ip: 10.0.4.1
dcae_collector_port: 8081
- repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
nb_api_version: 1.2.0
demo_artifacts_version: 1.3.0
- install_script_version: 1.2.1
+ 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
cloud_env: PUT openstack OR backspace HERE
diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml
index 44602a21..a323f23a 100644
--- a/heat/vLBMS/base_vlb.yaml
+++ b/heat/vLBMS/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_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -269,7 +265,6 @@ resources:
__pktgen_ipaddr__: { get_param: vpg_private_ip_0 }
__vdns_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_private_ipaddr__: { get_param: vlb_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__demo_artifacts_version__: { get_param: demo_artifacts_version }
__nb_api_version__: { get_param: nb_api_version }
@@ -295,7 +290,6 @@ resources:
echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt
echo "__vdns_ipaddr__" > /opt/config/vdns_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__nb_api_version__" > /opt/config/nb_api_version.txt
@@ -307,7 +301,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlbms&a=vlbms-scripts&e=zip&v=__install_script_version__" -o /opt/vlbms-scripts-__install_script_version__.zip
+ unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_lb_install.sh
cd /opt
chmod +x v_lb_install.sh
./v_lb_install.sh
@@ -346,7 +343,6 @@ resources:
__lb_to_pktgen_if__: { get_param: vlb_private_ip_2}
__local_private_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__nb_api_version__: { get_param: nb_api_version }
__install_script_version__: { get_param: install_script_version }
@@ -363,7 +359,6 @@ resources:
echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__nb_api_version__" > /opt/config/nb_api_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -372,7 +367,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlbms&a=vlbms-scripts&e=zip&v=__install_script_version__" -o /opt/vlbms-scripts-__install_script_version__.zip
+ unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
cd /opt
chmod +x v_dns_install.sh
./v_dns_install.sh
@@ -405,7 +403,6 @@ resources:
user_data:
str_replace:
params:
- __repo_url_blob__: { get_param: repo_url_blob }
__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 }
@@ -428,7 +425,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_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__nb_api_version__" > /opt/config/nb_api_version.txt
@@ -438,7 +434,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlbms&a=vlbms-scripts&e=zip&v=__install_script_version__" -o /opt/vlbms-scripts-__install_script_version__.zip
+ unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
cd /opt
chmod +x v_packetgen_install.sh
./v_packetgen_install.sh \ No newline at end of file
diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env
index 996b6811..6706b7ec 100644
--- a/heat/vLBMS/dnsscaling.env
+++ b/heat/vLBMS/dnsscaling.env
@@ -15,11 +15,10 @@ parameters:
vdns_name_0: zdfw1lb01dns02
vnf_id: vLoadBalancer_demo_app
vf_module_id: vLoadBalancer
- repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
nb_api_version: 1.2.0
demo_artifacts_version: 1.3.0
- install_script_version: 1.2.1
+ 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
cloud_env: PUT openstack OR backspace HERE
diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml
index a6ba45a1..c1cc3e7d 100644
--- a/heat/vLBMS/dnsscaling.yaml
+++ b/heat/vLBMS/dnsscaling.yaml
@@ -105,10 +105,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -184,7 +180,6 @@ resources:
__lb_to_pktgen_if__: { get_param: vlb_private_ip_2}
__local_private_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__nb_api_version__: { get_param: nb_api_version }
__install_script_version__: { get_param: install_script_version }
@@ -201,7 +196,6 @@ resources:
echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__nb_api_version__" > /opt/config/nb_api_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -210,7 +204,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlbms&a=vlbms-scripts&e=zip&v=__install_script_version__" -o /opt/vlbms-scripts-__install_script_version__.zip
+ unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
cd /opt
chmod +x v_dns_install.sh
./v_dns_install.sh \ No newline at end of file