diff options
Diffstat (limited to 'heat/ONAP/onap_openstack.yaml')
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 123 |
1 files changed, 121 insertions, 2 deletions
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 4e8f91d7..1038e326 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -298,6 +298,8 @@ parameters: type: string nbi_repo: type: string + aaf_repo: + type: string ################################ # # @@ -313,8 +315,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: @@ -422,6 +495,8 @@ parameters: type: string nbi_branch: type: string + aaf_branch: + type: string ############# # # @@ -994,6 +1069,7 @@ 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 @@ -1699,7 +1775,7 @@ resources: 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 } @@ -1775,6 +1851,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 @@ -1843,6 +1939,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 @@ -1999,7 +2114,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: @@ -2022,6 +2137,8 @@ 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 } template: | #!/bin/bash @@ -2036,6 +2153,8 @@ 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 # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh |