X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=a7598de7cacdcaa0da96c1c6972a11badc13e58e;hb=b32a99112d79bbdebf7711ba61a3850d1db5bb9b;hp=69d35e32d5a353301f5d2528d76807be5a75d83d;hpb=b6b374346fca8f186d3b48dd50a3c911e0a858d7;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 69d35e32..a7598de7 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -216,6 +216,10 @@ parameters: # # ########################### + dcae_deployment_profile: + type: string + description: DCAE deployment profile. Currently supported profiles R1, R2MVP. + dnsaas_config_enabled: type: string description: whether the DNSaaS configuration section is enabled @@ -290,6 +294,14 @@ parameters: type: string vnfsdk_repo: type: string + music_repo: + type: string + nbi_repo: + type: string + aaf_repo: + type: string + oof_repo: + type: string ################################ # # @@ -305,8 +317,79 @@ parameters: type: string so_docker: type: string + dcae_docker: type: string + default: latest + dcae_snmptrap_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.collectors.snmptrap + dcae_ves_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.collectors.ves.vescollector + dcae_bootstrap_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.bootstrap + dcae_cm_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.cm-container + dcae_k8sbootstrap_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.k8s-bootstrap-container + dcae_redisc_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.redis-cluster-container + dcae_tca_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.deployments.tca-cdap-container + dcae_cb_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.cdapbroker + dcae_cbs_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.configbinding + dcae_dh_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.deployment-handler + dcae_inv_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.inventory-api + dcae_ph_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.deployment-handler + dcae_sch_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.platform.servicechange-handler + dcae_heartbeat_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.services.heartbeat + dcae_prh_docker: + type: string + default: latest + description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server + holmes_em_docker: + type: string + default: latest + description: Docker image version for onap/holmes/engine-management + holmes_rm_docker: + type: string + default: latest + description: Docker image version for onap/holmes/rule-management + policy_docker: type: string portal_docker: @@ -315,6 +398,8 @@ parameters: type: string sdc_docker: type: string + sdc_wfd_docker: + type: string sdnc_docker: type: string vid_docker: @@ -374,6 +459,8 @@ parameters: type: string vfc_wfengine_activiti_docker: type: string + vfc_multivimproxy_docker: + type: string cbam_username: type: string @@ -406,7 +493,14 @@ parameters: type: string vnfsdk_branch: type: string - + music_branch: + type: string + nbi_branch: + type: string + aaf_branch: + type: string + oof_branch: + type: string ############# # # @@ -551,6 +645,7 @@ resources: __music_ip_addr__: { get_param: music_ip_addr } __oof_ip_addr__: { get_param: oof_ip_addr } __aaf_ip_addr__: { get_param: aaf_ip_addr } + __nbi_ip_addr__: { get_param: nbi_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __dns_forwarder__: { get_param: dns_forwarder } @@ -581,6 +676,7 @@ resources: echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt + echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt @@ -941,6 +1037,7 @@ resources: __music_ip_addr__: { get_param: music_ip_addr } __oof_ip_addr__: { get_param: oof_ip_addr } __aaf_ip_addr__: { get_param: aaf_ip_addr } + __nbi_ip_addr__: { get_param: nbi_ip_addr } __external_dns__: { get_param: external_dns } __ubuntu_1404_image__: { get_param: ubuntu_1404_image } __ubuntu_1604_image__: { get_param: ubuntu_1604_image } @@ -976,14 +1073,19 @@ resources: echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt + echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt + echo "__sdc_ip_addr__" > /opt/config/sdc_be_ip_addr.txt + echo "__sdc_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt + echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__vm_flavor__" > /opt/config/vm_flavor.txt @@ -1187,6 +1289,7 @@ resources: __mr_ip_addr__: { get_param: mr_ip_addr } __private_ip__: { get_param: sdc_ip_addr } __docker_version__: { get_param: sdc_docker } + __sdc_wfd_docker__: { get_param: sdc_wfd_docker } __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } @@ -1206,6 +1309,7 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__sdc_wfd_docker__" > /opt/config/sdc_wfd_docker.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt @@ -1575,6 +1679,7 @@ resources: __cbam_username__: { get_param: cbam_username } __cbam_password__: { get_param: cbam_password } __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker } + __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker } __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker } __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker } __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker } @@ -1614,6 +1719,7 @@ resources: echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt + echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt @@ -1671,10 +1777,10 @@ resources: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } - flavor: { get_param: flavor_small } + flavor: { get_param: flavor_large } name: str_replace: - template: base-dcae-bootstrap + template: base-dcae params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } @@ -1695,6 +1801,7 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs + __dcae_deployment_profile__: { get_param: dcae_deployment_profile } __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } @@ -1749,6 +1856,26 @@ resources: __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] } __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] } __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + # container versions + __dcae_docker__: { get_param: dcae_docker } + __dcae_snmptrap_docker__: { get_param: dcae_snmptrap_docker } + __dcae_ves_docker__: { get_param: dcae_ves_docker } + __dcae_bootstrap_docker__: { get_param: dcae_bootstrap_docker } + __dcae_cm_docker__: { get_param: dcae_cm_docker } + __dcae_k8sbootstrap_docker__: { get_param: dcae_k8sbootstrap_docker } + __dcae_redisc_docker__: { get_param: dcae_redisc_docker } + __dcae_tca_docker__: { get_param: dcae_tca_docker } + __dcae_cb_docker__: { get_param: dcae_cb_docker } + __dcae_cbs_docker__: { get_param: dcae_cbs_docker } + __dcae_dh_docker__: { get_param: dcae_dh_docker } + __dcae_inv_docker__: { get_param: dcae_inv_docker } + __dcae_ph_docker__: { get_param: dcae_ph_docker } + __dcae_sch_docker__: { get_param: dcae_sch_docker } + __dcae_heartbeat_docker__: { get_param: dcae_heartbeat_docker } + __dcae_prh_docker__: { get_param: dcae_prh_docker } + __holmes_em_docker__: { get_param: holmes_em_docker } + __holmes_rm_docker__: { get_param: holmes_rm_docker } + template: | #!/bin/bash @@ -1766,6 +1893,7 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs + echo "__dcae_deployment_profile__" > /opt/config/dcae_deployment_profile.txt echo "__mac_addr__" > /opt/config/mac_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt @@ -1804,6 +1932,7 @@ resources: echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/msb_ip_addr.txt echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt # floating IPs @@ -1815,6 +1944,25 @@ resources: echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt echo "__openo_floating_ip_addr__" > /opt/config/openo_floating_ip_addr.txt echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt + # container versions + echo "__dcae_docker__" > /opt/config/dcae_docker.txt + echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt + echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt + echo "__dcae_bootstrap_docker__" > /opt/config/dcae_docker_bootstrap.txt + echo "__dcae_cm_docker__" > /opt/config/dcae_docker_cm.txt + echo "__dcae_k8sbootstrap_docker__" > /opt/config/dcae_docker_k8sbootstrap.txt + echo "__dcae_redisc_docker__" > /opt/config/dcae_docker_redisc.txt + echo "__dcae_tca_docker__" > /opt/config/dcae_docker_tca.txt + echo "__dcae_cb_docker__" > /opt/config/dcae_docker_cb.txt + echo "__dcae_cbs_docker__" > /opt/config/dcae_docker_cbs.txt + echo "__dcae_dh_docker__" > /opt/config/dcae_docker_dh.txt + echo "__dcae_inv_docker__" > /opt/config/dcae_docker_inv.txt + echo "__dcae_ph_docker__" > /opt/config/dcae_docker_ph.txt + echo "__dcae_sch_docker__" > /opt/config/dcae_docker_sch.txt + echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt + echo "__dcae_prh_docker__" > /opt/config/dcae_docker_prh.txt + echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt + echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh @@ -1862,6 +2010,8 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __docker_version__: { get_param: music_docker } + __music_repo__: { get_param: music_repo } + __gerrit_branch__: { get_param: music_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -1876,6 +2026,8 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__music_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt @@ -1904,8 +2056,8 @@ resources: oof_vm: type: OS::Nova::Server properties: - image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_medium } + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_large } name: str_replace: template: base-oof @@ -1925,6 +2077,8 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __docker_version__: { get_param: oof_docker } + __oof_repo__: { get_param: oof_repo } + __gerrit_branch__: { get_param: oof_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -1939,6 +2093,8 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__oof_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt @@ -1967,7 +2123,7 @@ resources: aaf_vm: type: OS::Nova::Server properties: - image: { get_param: ubuntu_1404_image } + image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_medium } name: str_replace: @@ -1990,6 +2146,9 @@ resources: __docker_version__: { get_param: aaf_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aaf_repo__: { get_param: aaf_repo } + __gerrit_branch__: { get_param: aaf_branch } + __local_ip__: { get_param: aaf_ip_addr } template: | #!/bin/bash @@ -2004,6 +2163,9 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__aaf_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__local_ip__" > /opt/config/local_ip.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh @@ -2050,8 +2212,13 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __docker_version__: { get_param: nbi_docker } + __nbi_repo__: { get_param: nbi_repo } + __gerrit_branch__: { get_param: nbi_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __sdc_ip_addr__: { get_param: sdc_ip_addr } + __aai1_ip_addr__: { get_param: aai1_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } template: | #!/bin/bash @@ -2064,8 +2231,13 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__nbi_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt + echo "__aai1_ip_addr__" > /opt/config/aai_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/nbi_install.sh -o /opt/nbi_install.sh