X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvLBMS%2Fdnsscaling.yaml;h=7dcc462836bd2326ee94f2243bdc5a39d8186c99;hb=refs%2Fheads%2Fcasablanca;hp=37afe8ee1384a7cebe98a40e8d7e2baabf6fea61;hpb=c18a8faa269799bfe5eaddbb431aff86de689104;p=demo.git diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml index 37afe8ee..7dcc4628 100644 --- a/heat/vLBMS/dnsscaling.yaml +++ b/heat/vLBMS/dnsscaling.yaml @@ -65,10 +65,6 @@ parameters: type: string label: ONAP private network CIDR description: The CIDR of the protected private network - vlb_public_ip: - type: string - label: vLoadBalancer public IP address - description: Public IP address of the vLoadBalancer vlb_private_ip_0: type: string label: vLoadBalancer private IP address towards the private network @@ -77,6 +73,10 @@ parameters: type: string label: vLoadBalancer private IP address towards the ONAP management network description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components + vlb_private_ip_2: + type: string + label: vLoadBalancer private IP address towards the vPacketGen network + description: Private IP address that is assigned to the vLoadBalancer to communicate with vPacketGen vdns_private_ip_0: type: string label: vDNS private IP address towards the private network @@ -105,26 +105,28 @@ 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 - description: URL of the repository that hosts the demo packages install_script_version: 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 description: Cloud environment (e.g., openstack, rackspace) + nexus_artifact_repo: + type: string + description: Root URL for the Nexus repository for Maven artifacts. + default: "https://nexus.onap.org" + sec_group: + type: string + description: ONAP Security Group + dns_enabled: + type: string + description: Enable/disable DNS (by default use true) ############# # # @@ -156,12 +158,16 @@ resources: properties: network: { get_param: vlb_private_net_id } fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}] + security_groups: + - { get_param: sec_group } vdns_2_private_1_port: type: OS::Neutron::Port properties: network: { get_param: onap_private_net_id } fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] + security_groups: + - { get_param: sec_group } vdns_2: type: OS::Nova::Server @@ -181,16 +187,15 @@ resources: params: __lb_oam_int__: { get_param: vlb_private_ip_1 } __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } - __lb_public_ipaddr__: { get_param: vlb_public_ip } + __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 } - __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 } __cloud_env__: { get_param: cloud_env } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -198,19 +203,22 @@ resources: mkdir /opt/config echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt - echo "__lb_public_ipaddr__" > /opt/config/lb_public_ipaddr.txt + 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 "__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 echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.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 update + 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