X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=2db9f8bacf1f0bce8941edf40045f11071c2e424;hb=refs%2Fheads%2Famsterdam;hp=e897ffdcc2bba86556e0436a99ddd959dddbf716;hpb=d4d0d9fa55382eadfe759baccfaf6408f6338d28;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index e897ffdc..2db9f8ba 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -1,7 +1,7 @@ ########################################################################## # #==================LICENSE_START========================================== -# +# # # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. # @@ -39,10 +39,14 @@ parameters: # Parameters used across all ONAP components # # # ############################################## - + public_net_id: type: string - description: Public network for floating IP address allocation + description: The ID of the Public network for floating IP address allocation + + public_net_name: + type: string + description: The name of the Public network referred by public_net_id ubuntu_1404_image: type: string @@ -110,31 +114,35 @@ parameters: openstack_tenant_id: type: string - description: Openstack tenant ID + description: OpenStack tenant ID + + openstack_tenant_name: + type: string + description: OpenStack tenant name (matching with the openstack_tenant_id) openstack_username: type: string - description: Openstack username + description: OpenStack username openstack_auth_method: type: string - description: Openstack authentication method (password VS. api-key) + description: OpenStack authentication method (password VS. api-key) openstack_api_key: type: string - description: Openstack password or API Key + description: OpenStack password or API Key horizon_url: type: string - description: URL of Openstack Horizon + description: URL of OpenStack Horizon keystone_url: type: string - description: URL of Openstack Keystone + description: URL of OpenStack Keystone cloud_env: type: string - description: Cloud Provider Name + description: Cloud Provider Name in lower case openstack_region: type: string @@ -152,7 +160,11 @@ parameters: external_dns: type: string - description: First element of the dns_list for ONAP network + description: Public IP of the external DNS for ONAP network + + dns_forwarder: + type: string + description: the forwarder address for setting up ONAP's private DNS server oam_network_cidr: type: string @@ -167,16 +179,6 @@ parameters: type: string dcae_ip_addr: type: string - dcae_coll_ip_addr: - type: string - dcae_db_ip_addr: - type: string - dcae_hdp1_ip_addr: - type: string - dcae_hdp2_ip_addr: - type: string - dcae_hdp3_ip_addr: - type: string dns_ip_addr: type: string so_ip_addr: @@ -199,16 +201,6 @@ parameters: type: string openo_ip_addr: type: string -# dcae_coll_float_ip: -# type: string -# dcae_db_float_ip: -# type: string -# dcae_hdp1_float_ip: -# type: string -# dcae_hdp2_float_ip: -# type: string -# dcae_hdp3_float_ip: -# type: string ########################### # # @@ -216,93 +208,49 @@ parameters: # # ########################### - dcaeos_cloud_env: - type: string - description: the cloud flavor of the OpenStack instance where DCAE is deployed - - dcaeos_keystone_url: - type: string - description: the keystone URL of the OpenStack instance where DACE is deployed - - dcaeos_openstack_region: - type: string - description: the region of the OpenStack instance where DACE is deployed - - dcaeos_openstack_tenant_id: - type: string - description: the keystone URL of the OpenStack instance where DACE is deployed - - dcaeos_openstack_username: - type: string - description: the username of the identity API of the OpenStack instance where DACE is deployed - - dcaeos_openstack_password: + dnsaas_config_enabled: type: string - description: the password of the identity API of the OpenStack instance where DACE is deployed + description: whether the DNSaaS configuration section is enabled - dcaeos_dcae_key_name: + dnsaas_region: type: string - description: the key-pair name uploaded to the OpenStack instance where DACE is deployed + description: the region of the cloud instance providing the Designate DNS as a Service - dcaeos_dcae_pub_key: + dnsaas_keystone_url: type: string - description: the public key of the key-pair uploaded to the OpenStack instance where DACE is deployed + description: the keystone URL of the cloud instance providing the Designate DNS as a Service - dcaeos_private_key: + dnsaas_username: type: string - description: the private key of the key-pair uploaded to the OpenStack instance where DACE is deployed + description: the username of the cloud instance providing the Designate DNS as a Service - dcaeos_openstack_private_network_name: + dnsaas_password: type: string - description: the name/id of the network used as DCAE internal network in the OpenStack instance where DACE is deployed + description: the password of the cloud instance providing the Designate DNS as a Service - dcaeos_public_net_id: + dnsaas_tenant_name: type: string - description: the name/id of the network where DCAE gets floating IPs from in the OpenStack instance where DACE is deployed + description: the name of the tenant in the cloud instance providing the Designate DNS as a Service - dcaeos_ubuntu_1604_image: + dcae_keystone_url: type: string - description: the name/id of the Ubuntu1604 VM image in the OpenStack instance where DACE is deployed + description: the keystone URL for DCAE to use (via MultiCloud) - dcaeos_centos_7_image: + dcae_private_key: type: string - description: the name/id of the CentOS7 VM image in the OpenStack instance where DACE is deployed + description: the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs - dcaeos_security_group: + dcae_public_key: type: string - description: the name/id of the security group to be used by DACE VMs in the OpenStack instance where DACE is deployed + description: the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs - dcaeos_flavor_id: + dcae_centos_7_image: type: string - description: the name/id of the VM flavor to be used by DACE VMs in the OpenStack instance where DACE is deployed + description: the id/name of the CentOS 7 VM imange -# dcae_base_environment: -# type: string -# description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS) - - dcae_zone: + dcae_domain: type: string - description: DCAE Zone to use in VM names created by DCAE controller - -# dcae_state: -# type: string -# description: DCAE State to use in VM names created by DCAE controller - -# nexus_repo_root: -# type: string -# description: Root URL of Nexus repository - -# nexus_url_snapshot: -# type: string -# description: Snapshot of Maven repository for DCAE deployment - -# gitlab_branch: -# type: string -# description: Branch of the Gitlab repository - -# dcae_code_version: -# type: string -# description: DCAE Code Version Number + description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain) ##################### # # @@ -314,8 +262,6 @@ parameters: type: string appc_repo: type: string - dcae_repo: - type: string mr_repo: type: string so_repo: @@ -345,12 +291,12 @@ parameters: aai_docker: type: string + aai_sparky_docker: + type: string appc_docker: type: string so_docker: type: string - mr_docker: - type: string dcae_docker: type: string policy_docker: @@ -371,8 +317,6 @@ parameters: type: string mvim_docker: type: string - vfc_docker: - type: string uui_docker: type: string esr_docker: @@ -381,6 +325,36 @@ parameters: type: string cli_docker: type: string + vfc_nokia_docker: + type: string + vfc_ztevmanagerdriver_docker: + type: string + vfc_ztesdncdriver_docker: + type: string + vfc_vnfres_docker: + type: string + vfc_vnfmgr_docker: + type: string + vfc_vnflcm_docker: + type: string + vfc_resmanagement_docker: + type: string + vfc_nslcm_docker: + type: string + vfc_huawei_docker: + type: string + vfc_jujudriver_docker: + type: string + vfc_gvnfmdriver_docker: + type: string + vfc_emsdriver_docker: + type: string + vfc_catalog_docker: + type: string + vfc_wfengine_mgrservice_docker: + type: string + vfc_wfengine_activiti_docker: + type: string aai_branch: type: string @@ -390,8 +364,6 @@ parameters: type: string mr_branch: type: string - dcae_branch: - type: string policy_branch: type: string portal_branch: @@ -422,7 +394,6 @@ resources: properties: length: 4 - # Public key used to access ONAP components vm_key: type: OS::Nova::KeyPair @@ -436,6 +407,36 @@ resources: public_key: { get_param: pub_key } save_private_key: false + + # ONAP security group + onap_sg: + type: OS::Neutron::SecurityGroup + properties: + name: + str_replace: + template: base_rand + params: + base: onap_sg + rand: { get_resource: random-str } + description: security group used by ONAP + rules: + # All egress traffic + - direction: egress + ethertype: IPv4 + - direction: egress + ethertype: IPv6 + # ingress traffic + # ICMP + - protocol: icmp + - protocol: udp + port_range_min: 1 + port_range_max: 65535 + - protocol: tcp + port_range_min: 1 + port_range_max: 65535 + + + # ONAP management private network oam_onap: type: OS::Neutron::Net @@ -477,6 +478,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dns_ip_addr }}] + security_groups: + - { get_resource: onap_sg } dns_floating_ip: type: OS::Neutron::FloatingIP @@ -509,7 +512,6 @@ resources: __aai2_ip_addr__: { get_param: aai2_ip_addr } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } @@ -522,6 +524,7 @@ resources: __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __dns_forwarder__: { get_param: dns_forwarder } template: | #!/bin/bash @@ -536,7 +539,6 @@ resources: echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt @@ -548,6 +550,7 @@ resources: echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh @@ -562,6 +565,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai1_ip_addr }}] + security_groups: + - { get_resource: onap_sg } aai1_floating_ip: type: OS::Neutron::FloatingIP @@ -579,7 +584,7 @@ resources: str_replace: template: base-aai-inst1 params: - base: { get_param: vm_base_name } + base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - port: { get_resource: aai1_private_port } @@ -595,6 +600,7 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __docker_version__: { get_param: aai_docker } + __aai_sparky_docker__ : { get_param: aai_sparky_docker } __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } @@ -612,6 +618,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__aai_sparky_docker__" > /opt/config/sparky_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "aai_instance_1" > /opt/config/aai_instance.txt echo "__cloud_env__" > /opt/config/cloud_env.txt @@ -630,6 +637,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai2_ip_addr }}] + security_groups: + - { get_resource: onap_sg } aai2_floating_ip: type: OS::Neutron::FloatingIP @@ -646,7 +655,7 @@ resources: str_replace: template: base-aai-inst2 params: - base: { get_param: vm_base_name } + base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - port: { get_resource: aai2_private_port } @@ -698,6 +707,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}] + security_groups: + - { get_resource: onap_sg } so_floating_ip: type: OS::Neutron::FloatingIP @@ -714,7 +725,7 @@ resources: str_replace: template: base-so params: - base: { get_param: vm_base_name } + base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - port: { get_resource: so_private_port } @@ -777,6 +788,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mr_ip_addr }}] + security_groups: + - { get_resource: onap_sg } mrouter_floating_ip: type: OS::Neutron::FloatingIP @@ -790,7 +803,7 @@ resources: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } name: - str_replace: + str_replace: template: base-message-router params: base: { get_param: vm_base_name } @@ -840,20 +853,22 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: robot_ip_addr }}] + security_groups: + - { get_resource: onap_sg } robot_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } port_id: { get_resource: robot_private_port } - + robot_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_medium } name: - str_replace: + str_replace: template: base-robot params: base: { get_param: vm_base_name } @@ -875,8 +890,7 @@ resources: __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: mr_docker } - __gerrit_branch__: { get_param: mr_branch } + __gerrit_branch__: { get_param: robot_branch } __cloud_env__: { get_param: cloud_env } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } @@ -893,11 +907,13 @@ resources: __clamp_ip_addr__: { get_param: clamp_ip_addr } __openo_ip_addr__: { get_param: openo_ip_addr } __external_dns__: { get_param: external_dns } - __vm_image_name__: { get_param: ubuntu_1404_image } + __ubuntu_1404_image__: { get_param: ubuntu_1404_image } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } __vm_flavor__: { get_param: flavor_medium } __public_net_id__: { get_param: public_net_id } __script_version__: { get_param: artifacts_version } __robot_repo__: { get_param: robot_repo } + __docker_version__: { get_param: robot_docker } template: | #!/bin/bash @@ -932,7 +948,8 @@ resources: echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__vm_image_name__" > /opt/config/vm_image_name.txt + echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt echo "__vm_flavor__" > /opt/config/vm_flavor.txt echo "__script_version__" > /opt/config/script_version.txt echo "__public_net_id__" > /opt/config/public_net_id.txt @@ -951,6 +968,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: vid_ip_addr }}] + security_groups: + - { get_resource: onap_sg } vid_floating_ip: type: OS::Neutron::FloatingIP @@ -964,7 +983,7 @@ resources: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_medium } name: - str_replace: + str_replace: template: base-vid params: base: { get_param: vm_base_name } @@ -1009,13 +1028,15 @@ resources: chmod +x vid_install.sh ./vid_install.sh - + # SDN-C instantiation sdnc_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdnc_ip_addr }}] + security_groups: + - { get_resource: onap_sg } sdnc_floating_ip: type: OS::Neutron::FloatingIP @@ -1029,7 +1050,7 @@ resources: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } name: - str_replace: + str_replace: template: base-sdnc params: base: { get_param: vm_base_name } @@ -1083,6 +1104,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdc_ip_addr }}] + security_groups: + - { get_resource: onap_sg } sdc_floating_ip: type: OS::Neutron::FloatingIP @@ -1102,7 +1125,7 @@ resources: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_xlarge } name: - str_replace: + str_replace: template: base-sdc params: base: { get_param: vm_base_name } @@ -1124,7 +1147,7 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } - __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] } + __private_ip__: { get_param: sdc_ip_addr } __docker_version__: { get_param: sdc_docker } __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } @@ -1141,7 +1164,7 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__env_name__" > /opt/config/env_name.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt - echo "__public_ip__" > /opt/config/public_ip.txt + echo "__private_ip__" > /opt/config/private_ip.txt 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 @@ -1163,6 +1186,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: portal_ip_addr }}] + security_groups: + - { get_resource: onap_sg } portal_floating_ip: type: OS::Neutron::FloatingIP @@ -1176,7 +1201,7 @@ resources: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } name: - str_replace: + str_replace: template: base-portal params: base: { get_param: vm_base_name } @@ -1226,153 +1251,14 @@ resources: ./portal_install.sh - # DCAE Controller instantiation -# dcae_c_private_port: -# type: OS::Neutron::Port -# properties: -# network: { get_resource: oam_onap } -# fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] - -# dcae_c_floating_ip: -# type: OS::Neutron::FloatingIP -# properties: -# floating_network_id: { get_param: public_net_id } -# port_id: { get_resource: dcae_c_private_port } - -# dcae_c_vm: -# type: OS::Nova::Server -# properties: -# image: { get_param: ubuntu_1404_image } -# flavor: { get_param: flavor_medium } -# name: -# str_replace: -# template: base-dcae-controller -# params: -# base: { get_param: vm_base_name } -# key_name: { get_resource: vm_key } -# networks: -# - port: { get_resource: dcae_c_private_port } -# user_data_format: RAW -# user_data: -# str_replace: -# params: -# __nexus_repo__: { get_param: nexus_repo } -# __nexus_docker_repo__: { get_param: nexus_docker_repo } -# __nexus_username__: { get_param: nexus_username } -# __nexus_password__: { get_param: nexus_password } -# __nexus_url_snapshots__: { get_param: nexus_url_snapshot } -# __gitlab_branch__: { get_param: gitlab_branch } -# __dns_ip_addr__: { get_param: dns_ip_addr } -# __dcae_zone__: { get_param: dcae_zone } -# __dcae_state__: { get_param: dcae_state } -# __artifacts_version__: { get_param: artifacts_version } -# __tenant_id__: { get_param: openstack_tenant_id } -# __openstack_private_network_name__: { get_attr: [oam_onap, name] } -# __openstack_user__: { get_param: openstack_username } -# __openstack_password__: { get_param: openstack_api_key } -# __openstack_auth_method__: { get_param: openstack_auth_method } -# __key_name__: { get_param: key_name } -# __rand_str__: { get_resource: random-str } -# __pub_key__: { get_param: pub_key } -# __nexus_repo_root__: { get_param: nexus_repo_root } -# __openstack_region__: { get_param: openstack_region } -# __horizon_url__: { get_param: horizon_url } -# __keystone_url__: { get_param: keystone_url } -# __docker_version__: { get_param: dcae_docker } -# __gerrit_branch__: { get_param: dcae_branch } -# __dcae_code_version__: { get_param: dcae_code_version } -# __cloud_env__: { get_param: cloud_env } -# __public_net_id__: { get_param: public_net_id } -# __dcae_base_environment__: { get_param: dcae_base_environment } -# __dcae_ip_addr__: { get_param: dcae_ip_addr } -# __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } -# __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr } -# __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr } -# __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } -# __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } -# __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } -# __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip } -# __dcae_db_float_ip__: { get_param: dcae_db_float_ip } -# __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip } -# __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip } -# __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip } -# __external_dns__: { get_param: external_dns } -# __ubuntu_1404_image__: { get_param: ubuntu_1404_image } -# __ubuntu_1604_image__: { get_param: ubuntu_1604_image } -# __flavor_small__: { get_param: flavor_small } -# __flavor_medium__: { get_param: flavor_medium } -# __flavor_large__: { get_param: flavor_large } -# __flavor_xlarge__: { get_param: flavor_xlarge } -# __dcae_repo__: { get_param: dcae_repo } -# __mr_repo__: { get_param: mr_repo } -# template: | - #!/bin/bash - - # Create configuration files -# mkdir -p /opt/config -# echo "__nexus_repo__" > /opt/config/nexus_repo.txt -# echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt -# echo "__nexus_username__" > /opt/config/nexus_username.txt -# echo "__nexus_password__" > /opt/config/nexus_password.txt -# echo "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt -# echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt -# echo "__docker_version__" > /opt/config/docker_version.txt -# echo "__artifacts_version__" > /opt/config/artifacts_version.txt -# echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt -# echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt -# echo "__dcae_zone__" > /opt/config/dcae_zone.txt -# echo "__dcae_state__" > /opt/config/dcae_state.txt -# echo "__tenant_id__" > /opt/config/tenant_id.txt -# echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt -# echo "__openstack_user__" > /opt/config/openstack_user.txt -# echo "__openstack_password__" > /opt/config/openstack_password.txt -# echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt -# echo "__key_name__" > /opt/config/key_name.txt -# echo "__rand_str__" > /opt/config/rand_str.txt -# echo "__pub_key__" > /opt/config/pub_key.txt -# echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt -# echo "__openstack_region__" > /opt/config/openstack_region.txt -# echo "__horizon_url__" > /opt/config/horizon_url.txt -# echo "__keystone_url__" > /opt/config/keystone_url.txt -# echo "__cloud_env__" > /opt/config/cloud_env.txt -# echo "__public_net_id__" > /opt/config/public_net_id.txt -# echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt -# echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt -# echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt -# echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt -# echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt -# echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt -# echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt -# echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt -# echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt -# echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt -# echo "__dcae_db_float_ip__" > /opt/config/dcae_db_float_ip.txt -# echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt -# echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt -# echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt -# echo "__external_dns__" > /opt/config/external_dns.txt -# echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt -# echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt -# echo "__flavor_small__" > /opt/config/flavor_small.txt -# echo "__flavor_medium__" > /opt/config/flavor_medium.txt -# echo "__flavor_large__" > /opt/config/flavor_large.txt -# echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt -# echo "__dcae_repo__" > /opt/config/remote_repo.txt -# echo "__mr_repo__" > /opt/config/mr_repo.txt - - # Download and run install script -# curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh -# cd /opt -# chmod +x dcae_install.sh -# ./dcae_install.sh - - # Policy Engine instantiation policy_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}] + security_groups: + - { get_resource: onap_sg } policy_floating_ip: type: OS::Neutron::FloatingIP @@ -1386,7 +1272,7 @@ resources: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_xlarge } name: - str_replace: + str_replace: template: base-policy params: base: { get_param: vm_base_name } @@ -1440,6 +1326,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}] + security_groups: + - { get_resource: onap_sg } appc_floating_ip: type: OS::Neutron::FloatingIP @@ -1453,7 +1341,7 @@ resources: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } name: - str_replace: + str_replace: template: base-appc params: base: { get_param: vm_base_name } @@ -1509,6 +1397,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}] + security_groups: + - { get_resource: onap_sg } clamp_floating_ip: type: OS::Neutron::FloatingIP @@ -1525,7 +1415,7 @@ resources: str_replace: template: base-clamp params: - base: { get_param: vm_base_name } + base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - port: { get_resource: clamp_private_port } @@ -1586,6 +1476,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + security_groups: + - { get_resource: onap_sg } openo_floating_ip: type: OS::Neutron::FloatingIP @@ -1621,7 +1513,6 @@ resources: __aai2_ip_addr__: { get_param: aai2_ip_addr } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } @@ -1637,10 +1528,24 @@ resources: __vnfsdk_branch__: { get_param: vnfsdk_branch } __msb_docker__: { get_param: msb_docker } __mvim_docker__: { get_param: mvim_docker } - __vfc_docker__: { get_param: vfc_docker } __uui_docker__: { get_param: uui_docker } __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } + __vfc_nokia_docker__: { get_param: vfc_nokia_docker } + __vfc_ztevmanagerdriver_docker__: { get_param: vfc_ztevmanagerdriver_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 } + __vfc_vnflcm_docker__: { get_param: vfc_vnflcm_docker } + __vfc_resmanagement_docker__: { get_param: vfc_resmanagement_docker } + __vfc_nslcm_docker__: { get_param: vfc_nslcm_docker } + __vfc_huawei_docker__: { get_param: vfc_huawei_docker } + __vfc_jujudriver_docker__: { get_param: vfc_jujudriver_docker } + __vfc_gvnfmdriver_docker__: { get_param: vfc_gvnfmdriver_docker } + __vfc_emsdriver_docker__: { get_param: vfc_emsdriver_docker } + __vfc_catalog_docker__: { get_param: vfc_catalog_docker } + __vfc_wfengine_mgrservice_docker__: { get_param: vfc_wfengine_mgrservice_docker } + __vfc_wfengine_activiti_docker__: { get_param: vfc_wfengine_activiti_docker } template: | #!/bin/bash @@ -1658,17 +1563,31 @@ resources: echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt echo "__msb_docker__" > /opt/config/msb_docker.txt echo "__mvim_docker__" > /opt/config/mvim_docker.txt - echo "__vfc_docker__" > /opt/config/vfc_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt + echo "export ZTEVMANAGERDRIVER_DOCKER_VER=__vfc_ztevmanagerdriver_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 + echo "export VNFMGR_DOCKER_VER=__vfc_vnfmgr_docker__" >> /opt/config/vfc_docker.txt + echo "export VNFLCM_DOCKER_VER=__vfc_vnflcm_docker__" >> /opt/config/vfc_docker.txt + echo "export RESMANAGEMENT_DOCKER_VER=__vfc_resmanagement_docker__" >> /opt/config/vfc_docker.txt + echo "export NSLCM_DOCKER_VER=__vfc_nslcm_docker__" >> /opt/config/vfc_docker.txt + echo "export HUAWEI_DOCKER_VER=__vfc_huawei_docker__" >> /opt/config/vfc_docker.txt + echo "export JUJUDRIVER_DOCKER_VER=__vfc_jujudriver_docker__" >> /opt/config/vfc_docker.txt + echo "export GVNFMDRIVER_DOCKER_VER=__vfc_gvnfmdriver_docker__" >> /opt/config/vfc_docker.txt + echo "export EMSDRIVER_DOCKER_VER=__vfc_emsdriver_docker__" >> /opt/config/vfc_docker.txt + echo "export CATALOG_DOCKER_VER=__vfc_catalog_docker__" >> /opt/config/vfc_docker.txt + echo "export MGRSERVICE_DOCKER_VER=__vfc_wfengine_mgrservice_docker__" >> /opt/config/vfc_docker.txt + echo "export ACTIVITI_DOCKER_VER=__vfc_wfengine_activiti_docker__" >> /opt/config/vfc_docker.txt + # Create env file with the IP address of all ONAP components echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt - echo "export DCAE_COLL_IP=__dcae_coll_ip_addr__" >> /opt/config/onap_ips.txt echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt @@ -1693,6 +1612,8 @@ resources: properties: network: { get_resource: oam_onap } fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}] + security_groups: + - { get_resource: onap_sg } dcae_c_floating_ip: type: OS::Neutron::FloatingIP @@ -1704,7 +1625,7 @@ resources: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } - flavor: { get_param: flavor_medium } + flavor: { get_param: flavor_small } name: str_replace: template: base-dcae-bootstrap @@ -1713,11 +1634,12 @@ resources: key_name: { get_resource: vm_key } networks: - port: { get_resource: dcae_c_private_port } + #security_groups: + # - { get_resource: onap_sg } user_data_format: RAW user_data: str_replace: params: - __dcae_zone__: { get_param: dcae_zone } __rand_str__: { get_resource: random-str } # repo related __artifacts_version__: { get_param: artifacts_version } @@ -1726,48 +1648,59 @@ resources: __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } - __dcae_repo__: { get_param: dcae_repo } - __gerrit_branch__: { get_param: dcae_branch } # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs __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] } __dns_ip_addr__: { get_param: dns_ip_addr } __external_dns__: { get_param: external_dns } - # conf for the OpensStack env where DCAE is deployed - __dcaeos_cloud_env__: { get_param: dcaeos_cloud_env } - __dcaeos_keystone_url__: { get_param: dcaeos_keystone_url } - __dcaeos_openstack_region__: { get_param: dcaeos_openstack_region } - __dcaeos_tenant_id__: { get_param: dcaeos_openstack_tenant_id } - __dcaeos_openstack_user__: { get_param: dcaeos_openstack_username } - __dcaeos_openstack_password__: { get_param: dcaeos_openstack_password } - __dcaeos_key_name__: { get_param: dcaeos_dcae_key_name } - __dcaeos_pub_key__: { get_param: dcaeos_dcae_pub_key } - __dcaeos_private_key__: { get_param: dcaeos_private_key } - __dcaeos_openstack_private_network_name__: { get_param: dcaeos_openstack_private_network_name } - __dcaeos_public_net_id__: { get_param: dcaeos_public_net_id } - __dcaeos_ubuntu_1604_image__: { get_param: dcaeos_ubuntu_1604_image } - __dcaeos_centos_7_image__: { get_param: dcaeos_centos_7_image } - __dcaeos_security_group__ : { get_param: dcaeos_security_group } - __dcaeos_flavor_id__: { get_param: dcaeos_flavor_id } + __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_security_group__: { get_attr: [onap_sg, name] } + __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 } __sdc_ip_addr__: { get_param: sdc_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } + __aai1_ip_addr__: { get_param: aai1_ip_addr } + __aai2_ip_addr__: { get_param: aai2_ip_addr } # floating IPs __dns_floating_ip_addr__: { get_attr: [dns_floating_ip, floating_ip_address] } __aai1_floating_ip_addr__: { get_attr: [aai1_floating_ip, floating_ip_address] } __aai2_floating_ip_addr__: { get_attr: [aai2_floating_ip, floating_ip_address] } - __so_floating_ip_addr__: { get_attr: [so_floating_ip, floating_ip_address] } __mrouter_floating_ip_addr__: { get_attr: [mrouter_floating_ip, floating_ip_address] } - __robot_floating_ip_addr__: { get_attr: [robot_floating_ip, floating_ip_address] } - __vid_floating_ip_addr__: { get_attr: [vid_floating_ip, floating_ip_address] } - __sdnc_floating_ip_addr__: { get_attr: [sdnc_floating_ip, floating_ip_address] } __sdc_floating_ip_addr__: { get_attr: [sdc_floating_ip, floating_ip_address] } - __portal_floating_ip_addr__: { get_attr: [portal_floating_ip, floating_ip_address] } __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] } - __appc_floating_ip_addr__: { get_attr: [appc_floating_ip, floating_ip_address] } - __clamp_floating_ip_addr__: { get_attr: [clamp_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] } @@ -1785,7 +1718,6 @@ resources: echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt - echo "__dcae_repo__" > /opt/config/remote_repo.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs echo "__mac_addr__" > /opt/config/mac_addr.txt @@ -1793,46 +1725,53 @@ resources: echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt - # conf for the OpensStack env where DCAE is deployed + 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_openstack_region__" > /opt/config/openstack_region.txt + echo "__dcaeos_region__" > /opt/config/openstack_region.txt echo "__dcaeos_tenant_id__" > /opt/config/tenant_id.txt - echo "__dcaeos_tenant_id__" > /opt/config/tenant_name.txt - echo "__dcaeos_openstack_user__" > /opt/config/openstack_user.txt - echo "__dcaeos_openstack_password__" > /opt/config/openstack_password.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_pub_key__" > /opt/config/pub_key.txt + echo "__dcaeos_public_key__" > /opt/config/pub_key.txt echo "__dcaeos_private_key__" > /opt/config/priv_key - echo "__dcaeos_openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt - echo "__dcaeos_public_net_id__" > /opt/config/public_net_id.txt + 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 echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_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 echo "__dns_floating_ip_addr__" > /opt/config/dns_floating_ip_addr.txt echo "__aai1_floating_ip_addr__" > /opt/config/aai1_floating_ip_addr.txt echo "__aai2_floating_ip_addr__" > /opt/config/aai2_floating_ip_addr.txt - echo "__so_floating_ip_addr__" > /opt/config/so_floating_ip_addr.txt echo "__mrouter_floating_ip_addr__" > /opt/config/mrouter_floating_ip_addr.txt - echo "__robot_floating_ip_addr__" > /opt/config/robot_floating_ip_addr.txt - echo "__vid_floating_ip_addr__" > /opt/config/vid_floating_ip_addr.txt - echo "__sdnc_floating_ip_addr__" > /opt/config/sdnc_floating_ip_addr.txt echo "__sdc_floating_ip_addr__" > /opt/config/sdc_floating_ip_addr.txt - echo "__portal_floating_ip_addr__" > /opt/config/portal_floating_ip_addr.txt echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt - echo "__appc_floating_ip_addr__" > /opt/config/appc_floating_ip_addr.txt - echo "__clamp_floating_ip_addr__" > /opt/config/clamp_floating_ip_addr.txt - echo "__openo_floating_ip_addr__" > /opt/config/opoeno_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 # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh cd /opt chmod +x dcae2_install.sh - ./dcae2_install.sh + ./dcae2_install.sh > /tmp/dcae2_install.log 2>&1