X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=18ac6d628780d2ac4a235fc1a9c99f3d3ff00aa4;hb=5a57bd2e80cd4ac81ac525a00f304a3261b8c20c;hp=76526fcb71306a9cfd8bb3c91c21319202276483;hpb=34cdc2249d76d164fa03fe3e1d088cefe2a3f5dc;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 76526fcb..18ac6d62 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -3,7 +3,7 @@ #==================LICENSE_START========================================== # # -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -121,13 +121,9 @@ parameters: type: string description: OpenStack username - openstack_auth_method: - type: string - description: OpenStack authentication method (password VS. api-key) - openstack_api_key: type: string - description: OpenStack password or API Key + description: Encrypted OpenStack password keystone_url: type: string @@ -228,64 +224,9 @@ parameters: dcae_deployment_profile: type: string - default: R2 + default: R3 description: DCAE deployment profile. Currently supported profiles R2, R2MVP, and R2PLUS. - dnsaas_config_enabled: - type: string - default: "" - description: (deprecated in R2) whether the DNSaaS configuration section is enabled - - dnsaas_region: - type: string - default: "" - description: (deprecated in R2) the region of the cloud instance providing the Designate DNS as a Service - - dnsaas_keystone_url: - type: string - default: "" - description: (deprecated in R2) the keystone URL of the cloud instance providing the Designate DNS as a Service - - dnsaas_username: - type: string - default: "" - description: (deprecated in R2) the username of the cloud instance providing the Designate DNS as a Service - - dnsaas_password: - type: string - default: "" - description: (deprecated in R2) the password of the cloud instance providing the Designate DNS as a Service - - dnsaas_tenant_name: - type: string - default: "" - description: (deprecated in R2) the name of the tenant in the cloud instance providing the Designate DNS as a Service - - dcae_keystone_url: - type: string - default: "" - description: (deprecated in R2) the keystone URL for DCAE to use (via MultiCloud) - - dcae_private_key: - type: string - default: "" - description: (deprecated in R2) the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs - - dcae_public_key: - type: string - default: "" - description: (deprecated in R2) the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs - - dcae_centos_7_image: - type: string - default: "" - description: (deprecated in R2) the id/name of the CentOS 7 VM imange - - dcae_domain: - type: string - default: "" - description: (deprecated in R2) the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain) - ##################### # # # ONAP repositories # @@ -341,66 +282,94 @@ parameters: dcae_docker: type: string default: latest - dcae_snmptrap_docker: + dcae_bootstrap_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.collectors.snmptrap - dcae_ves_docker: + description: Docker image version for onap/org.onap.dcaegen2.deployments.bootstrap + dcae_k8sbootstrap_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.collectors.ves.vescollector - dcae_bootstrap_docker: + description: Docker image version for onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container + dcae_redisc_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.deployments.bootstrap - dcae_cm_docker: + description: Docker image version for onap/org.onap.dcaegen2.deployments.redis-cluster-container + dcae_hc_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.deployments.cm-container - dcae_k8sbootstrap_docker: + description: Docker image version for onap/org.onap.dcaegen2.deployments.healthcheck-container + dcae_tls_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.deployments.k8s-bootstrap-container - dcae_redisc_docker: + description: Docker image version for onap/org.onap.dcaegen2.deployments.tls-init-container + dcae_cb_docker: + type: string + default: latest + description: Docker image version for onap/org.onap.dcaegen2.platform.cdapbroker + dcae_snmptrap_docker: + type: string + default: latest + description: Docker image version for onap/org.onap.dcaegen2.collectors.snmptrap + dcae_ves_docker: + type: string + default: latest + description: Docker image version for onap/org.onap.dcaegen2.collectors.ves.vescollector + dcae_hvves_docker: + type: string + default: latest + description: Docker image version for onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main + dcae_datafile_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.deployments.redis-cluster-container + description: Docker image version for onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server + dcae_cm_docker: + type: string + default: latest + description: Docker image version for onap/org.onap.dcaegen2.deployments.cm-container dcae_tca_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.deployments.tca-cdap-container - dcae_cb_docker: + description: Docker image version for onap/org.onap.dcaegen2.deployments.tca-cdap-container + dcae_tca2_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.platform.cdapbroker + description: Docker image version for onap/org.onap.dcaegen2.analytics.tca-gen2 dcae_cbs_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.platform.configbinding + description: Docker image version for onap/org.onap.dcaegen2.platform.configbinding.app-app dcae_dh_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.platform.deployment-handler + description: Docker image version for onap/org.onap.dcaegen2.platform.deployment-handler dcae_inv_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.platform.inventory-api + description: Docker image version for onap/org.onap.dcaegen2.platform.inventory-api dcae_ph_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.platform.deployment-handler + description: Docker image version for onap/org.onap.dcaegen2.platform.policy-handler dcae_sch_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.platform.servicechange-handler + description: Docker image version for onap/org.onap.dcaegen2.platform.servicechange-handler + dcae_prh_docker: + type: string + default: latest + description: Docker image version for onap/org.onap.dcaegen2.services.prh.prh-app-server dcae_heartbeat_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.services.heartbeat - dcae_prh_docker: + description: Docker image version for onap/org.onap.dcaegen2.services.heartbeat + dcae_mua_docker: + type: string + default: latest + description: Docker image version for onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor + dcae_msnmp_docker: type: string default: latest - description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server + description: Docker image version for onap/org.onap.dcaegen2.services.mapper.vesadapter.snmpmapper holmes_em_docker: type: string default: latest @@ -1266,6 +1235,15 @@ resources: echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt + # in HEAT install the components are on the same IP address but not for OOM + echo "__so_ip_addr__" > /opt/config/so_apihand_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_asdchand_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_bpmn_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_catdb_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_openstack_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_reqdb_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_sdnc_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_vfc_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_healthcheck_ip_addr.txt @@ -2090,38 +2068,6 @@ resources: __mac_addr__: { get_attr: [dcae_private_port, mac_address] } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_float_ip__: { get_attr: [dcae_floating_ip, floating_ip_address] } - __dns_forwarder__: { get_param: dns_forwarder } - __dcae_domain__: { get_param: dcae_domain } - # conf for VMs DCAE is to bringup - __openstack_keystone_url__: { get_param: keystone_url } - __dcae_keystone_url__: { get_param: dcae_keystone_url } - __dcaeos_cloud_env__: { get_param: cloud_env } - __dcaeos_keystone_url__: { get_param: dcae_keystone_url } - __dcaeos_region__: { get_param: openstack_region } - __dcaeos_tenant_id__: { get_param: openstack_tenant_id } - __dcaeos_tenant_name__: { get_param: openstack_tenant_name } - __dcaeos_security_group__: - str_replace: - template: 'onap_sg_rand' - params: - rand: { get_resource: random-str } - __dcaeos_username__: { get_param: openstack_username } - __dcaeos_password__: { get_param: openstack_api_key } - __dcaeos_key_name__: { get_resource: vm_key } - __dcaeos_public_key__: { get_param: dcae_public_key } - __dcaeos_private_key__: { get_param: dcae_private_key } - __dcaeos_private_network_name__: { get_attr: [oam_onap, name] } - __dcaeos_public_network_name__: { get_param: public_net_name } - __dcaeos_ubuntu_1604_image__: { get_param: ubuntu_1604_image } - __dcaeos_centos_7_image__: { get_param: dcae_centos_7_image } - __dcaeos_flavor_id__: { get_param: flavor_medium } - __dcaeos_flavor_id_cdap__: { get_param: flavor_large } - __dcaeos_dnsaas_config_enabled__: { get_param: dnsaas_config_enabled } - __dcaeos_dnsaas_region__: { get_param: dnsaas_region } - __dcaeos_dnsaas_keystone_url__: { get_param: dnsaas_keystone_url } - __dnsaas_tenant_name__: { get_param: dnsaas_tenant_name } - __dcaeos_dnsaas_username__: { get_param: dnsaas_username } - __dcaeos_dnsaas_password__: { get_param: dnsaas_password } # fixed private IPs __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } @@ -2140,24 +2086,31 @@ resources: __dcae_floating_ip_addr__: { get_attr: [dcae_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_hc_docker__: { get_param: dcae_hc_docker } + __dcae_tls_docker__: { get_param: dcae_tls_docker } __dcae_cb_docker__: { get_param: dcae_cb_docker } + __dcae_snmptrap_docker__: { get_param: dcae_snmptrap_docker } + __dcae_ves_docker__: { get_param: dcae_ves_docker } + __dcae_hvves_docker__: { get_param: dcae_hvves_docker } + __dcae_datafile_docker__: { get_param: dcae_datafile_docker } + __dcae_cm_docker__: { get_param: dcae_cm_docker } + __dcae_tca_docker__: { get_param: dcae_tca_docker } + __dcae_tca2_docker__: { get_param: dcae_tca2_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 } + __dcae_heartbeat_docker__: { get_param: dcae_heartbeat_docker } + __dcae_mua_docker__: { get_param: dcae_mua_docker } + __dcae_msnmp_docker__: { get_param: dcae_msnmp_docker } __holmes_em_docker__: { get_param: holmes_em_docker } __holmes_rm_docker__: { get_param: holmes_rm_docker } - + template: | #!/bin/bash @@ -2171,34 +2124,6 @@ resources: 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 "__dns_forwarder__" > /opt/config/dns_forwarder.txt - echo "__dcae_domain__" > /opt/config/dcae_domain.txt - # conf for the OpenStack env where DCAE is deployed - echo "__openstack_keystone_url__" > /opt/config/openstack_keystone_url.txt - echo "__dcaeos_cloud_env__" > /opt/config/cloud_env.txt - echo "__dcaeos_keystone_url__" > /opt/config/keystone_url.txt - echo "__dcaeos_region__" > /opt/config/openstack_region.txt - echo "__dcaeos_tenant_id__" > /opt/config/tenant_id.txt - echo "__dcaeos_tenant_name__" > /opt/config/tenant_name.txt - echo "__dcaeos_username__" > /opt/config/openstack_user.txt - echo "__dcaeos_password__" > /opt/config/openstack_password.txt - echo "__dcaeos_key_name__" > /opt/config/key_name.txt - echo "__dcaeos_public_key__" > /opt/config/pub_key.txt - echo "__dcaeos_private_key__" > /opt/config/priv_key - echo "__dcaeos_private_network_name__" > /opt/config/openstack_private_network_name.txt - echo "__dcaeos_public_network_name__" > /opt/config/public_net_name.txt - echo "__dcaeos_public_network_name__" > /opt/config/public_net_id.txt - echo "__dcaeos_ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt - echo "__dcaeos_centos_7_image__" > /opt/config/centos_7_image.txt - echo "__dcaeos_security_group__" > /opt/config/security_group.txt - echo "__dcaeos_flavor_id__" > /opt/config/flavor_id.txt - echo "__dcaeos_flavor_id_cdap__" > /opt/config/flavor_id_cdap.txt - echo "__dcaeos_dnsaas_config_enabled__" > /opt/config/dnsaas_config_enabled.txt - echo "__dcaeos_dnsaas_region__" > /opt/config/dnsaas_region.txt - echo "__dcaeos_dnsaas_keystone_url__" > /opt/config/dnsaas_keystone_url.txt - echo "__dnsaas_tenant_name__" > /opt/config/dnsaas_tenant_name.txt - echo "__dcaeos_dnsaas_username__" > /opt/config/dnsaas_username.txt - echo "__dcaeos_dnsaas_password__" > /opt/config/dnsaas_password.txt # fixed private IP addresses of other ONAP components echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt @@ -2218,21 +2143,28 @@ resources: echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.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_hc_docker__" > /opt/config/dcae_docker_hc.txt + echo "__dcae_tls_docker__" > /opt/config/dcae_docker_tls.txt echo "__dcae_cb_docker__" > /opt/config/dcae_docker_cb.txt + echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt + echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt + echo "__dcae_hvves_docker__" > /opt/config/dcae_docker_hvves.txt + echo "__dcae_datafile_docker__" > /opt/config/dcae_docker_datafile.txt + echo "__dcae_cm_docker__" > /opt/config/dcae_docker_cm.txt + echo "__dcae_tca_docker__" > /opt/config/dcae_docker_tca.txt + echo "__dcae_tca2_docker__" > /opt/config/dcae_docker_tca2.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 "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt + echo "__dcae_mua_docker__" > /opt/config/dcae_docker_mua.txt + echo "__dcae_msnmp_docker__" > /opt/config/dcae_docker_msnmp.txt echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt @@ -2438,6 +2370,9 @@ resources: - path: /opt/aaf_vm_init.sh permissions: '0755' content: { get_file: cloud-config/aaf_vm_init.sh } + - path: /opt/config/sample_ca/aaf.signer.b64 + permissions: '0600' + content: { get_file: cloud-config/sample_ca/aaf.signer.b64 } - path: /etc/init.d/serv.sh permissions: '0755' content: @@ -2459,14 +2394,17 @@ resources: __docker_version__: { get_param: aaf_docker } __aaf_repo__: { get_param: aaf_repo } __gerrit_branch__: { get_param: aaf_branch } + __public_ip__: { get_attr: [aaf_floating_ip, floating_ip_address] } __local_ip__: { get_param: aaf_ip_addr } template: | #!/bin/bash # Create configuration files + mkdir -p /opt/config/sample_ca echo "__docker_version__" > /opt/config/docker_version.txt echo "__aaf_repo__" > /opt/config/remote_repo.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__public_ip__" > /opt/config/public_ip.txt echo "__local_ip__" > /opt/config/local_ip.txt cd /opt