X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvCPE%2Fvbrgemu%2Fbase_vcpe_vbrgemu.yaml;h=d6b8fbc21197736ef49acf4e079089b99459f1f5;hb=a0081c9434b6ef4b43ef29af01b1f1f06dcc0b25;hp=a7869950ed285ee918584ba4e84233490bf51f87;hpb=faf20e9b88fd93a18d70883fc3dcef7b3a8b64d1;p=demo.git diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml index a7869950..d6b8fbc2 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml @@ -67,18 +67,19 @@ parameters: # type: string # label: vBRGEMU Home private network CIDR # description: The CIDR of the input side of vBRGEMU Home private network - vbrgemu_private_ip_0: - type: string - label: vGW private IP address - description: Private IP address towards the BRGEMU-BNG network +## vbrgemu_private_ip_0: +## type: string +## label: vGW private IP address +## description: Private IP address towards the BRGEMU-BNG network +## VPP will use DHCP so does not need to be provided by preload #vbrgemu_private_ip_1: # type: string # label: vGW private IP address # description: Private IP address towards the BRGEMU private network vbrgemu_name_0: type: string - label: vGW name - description: Name of the vGW + label: vBRG name + description: Name of the vBRG vnf_id: type: string label: VNF ID @@ -95,15 +96,7 @@ 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: + script_version: type: string label: Installation script version number description: Version number of the scripts that install the vFW demo app @@ -111,38 +104,19 @@ parameters: type: string label: Artifacts version used in demo vnfs description: Artifacts (jar, tar.gz) version used in demo vnfs + nexus_artifact_repo: + type: string + description: Root URL for the Nexus repository for Maven artifacts. + default: "https://nexus.onap.org" cloud_env: type: string label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) - vpp_source_repo_url: - type: string - label: VPP Source Git Repo - description: URL for VPP source codes - vpp_source_repo_branch: - type: string - label: VPP Source Git Branch - description: Git Branch for the VPP source codes - hc2vpp_source_repo_url: - type: string - label: Honeycomb Source Git Repo - description: URL for Honeycomb source codes - hc2vpp_source_repo_branch: - type: string - label: Honeycomb Source Git Branch - description: Git Branch for the Honeycomb source codes - vpp_patch_url: - type: string - label: VPP Patch URL - description: URL for VPP patch for vBRG Emulator sdnc_ip: type: string label: SDNC ip address description: SDNC ip address used to set NAT - compile_state: - type: string - label: Compile State - description: State to compile code or not + ############# # # # RESOURCES # @@ -186,7 +160,8 @@ resources: type: OS::Neutron::Port properties: network: { get_param: vbrgemu_bng_private_net_id } - fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}] + # fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }}] + ## fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}] #vbrgemu_private_1_port: # type: OS::Neutron::Port @@ -213,18 +188,11 @@ resources: # __brgemu_net_ipaddr__: { get_param: vbrgemu_private_ip_1 } # __brgemu_cidr__: { get_param: vbrgemu_private_net_cidr } __brgemu_bng_private_net_cidr__: { get_param: vbrgemu_bng_private_net_cidr } - __repo_url_blob__ : { get_param: repo_url_blob } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } + __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } - __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } - __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } - __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } - __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } - __vpp_patch_url__ : { get_param: vpp_patch_url } __sdnc_ip__ : { get_param: sdnc_ip } - __compile_state__ : { get_param: compile_state } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -233,21 +201,17 @@ resources: #echo "__brgemu_net_ipaddr__" > /opt/config/brgemu_net_ipaddr.txt #echo "__brgemu_cidr__" > /opt/config/brgemu_net_cidr.txt echo "__brgemu_bng_private_net_cidr__" > /opt/config/brgemu_bng_private_net_cidr.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 "__install_script_version__" > /opt/config/install_script_version.txt + echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt - echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt - echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt - echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt - echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt - echo "__compile_state__" > /opt/config/compile_state.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/vcpe/__install_script_version__/v_brgemu_install.sh -o /opt/v_brgemu_install.sh + apt-get -y install unzip + if [[ "__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.vcpe&a=vcpe-scripts&e=zip&v=__script_version__" -o /opt/vcpe-scripts-__script_version__.zip + unzip -j /opt/vcpe-scripts-__script_version__.zip -d /opt v_brgemu_install.sh cd /opt chmod +x v_brgemu_install.sh ./v_brgemu_install.sh