diff options
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/vLBMS/base_vlb.env | 5 | ||||
| -rw-r--r-- | heat/vLBMS/base_vlb.yaml | 16 | ||||
| -rw-r--r-- | heat/vLBMS/dnsscaling.env | 7 | ||||
| -rw-r--r-- | heat/vLBMS/dnsscaling.yaml | 10 |
4 files changed, 24 insertions, 14 deletions
diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env index 3454fa43..a447bc20 100644 --- a/heat/vLBMS/base_vlb.env +++ b/heat/vLBMS/base_vlb.env @@ -27,8 +27,9 @@ parameters: 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/repositories/releases - demo_artifacts_version: 1.2.0 + 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 key_name: vlb_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml index b04feb7f..44602a21 100644 --- a/heat/vLBMS/base_vlb.yaml +++ b/heat/vLBMS/base_vlb.yaml @@ -160,11 +160,15 @@ parameters: demo_artifacts_version: type: string label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs + description: Version number for downloading the vPacketGen streams for VPP and VES + nb_api_version: + type: string + label: Northbound API version + description: Version number of the health check and config APIs install_script_version: type: string label: Installation script version number - description: Version number of the scripts that install the vFW demo app + description: Version number of the scripts that install the vLB demo app cloud_env: type: string label: Cloud environment @@ -268,6 +272,7 @@ resources: __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 } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } @@ -293,6 +298,7 @@ resources: 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 echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt @@ -342,7 +348,7 @@ resources: __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 } - __demo_artifacts_version__: { get_param: demo_artifacts_version } + __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } @@ -359,7 +365,7 @@ resources: 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 echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt @@ -407,6 +413,7 @@ resources: __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr } __vlb_ipaddr__: { get_param: vlb_private_ip_2 } __demo_artifacts_version__: { get_param: demo_artifacts_version } + __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } __pg_int__: { get_param: pg_int } __vlb_mac__: { get_attr: [vlb_private_2_port, mac_address] } @@ -424,6 +431,7 @@ resources: 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 echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__pg_int__" > /opt/config/pg_int.txt echo "__vlb_mac__" > /opt/config/vlb_mac.txt diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env index d40bf96f..996b6811 100644 --- a/heat/vLBMS/dnsscaling.env +++ b/heat/vLBMS/dnsscaling.env @@ -16,9 +16,10 @@ parameters: 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/repositories/releases - demo_artifacts_version: 1.2.0 + 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 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
\ No newline at end of file + cloud_env: PUT openstack OR backspace HERE diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml index 518bcac3..a6ba45a1 100644 --- a/heat/vLBMS/dnsscaling.yaml +++ b/heat/vLBMS/dnsscaling.yaml @@ -117,10 +117,10 @@ parameters: type: string label: Installation script version number description: Version number of the scripts that install the vFW demo app - demo_artifacts_version: + nb_api_version: type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs + label: Northbound API version + description: Version number of the health check and config APIs cloud_env: type: string label: Cloud environment @@ -186,7 +186,7 @@ resources: __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 } - __demo_artifacts_version__: { get_param: demo_artifacts_version } + __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } @@ -203,7 +203,7 @@ resources: 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 echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt |