X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=3ba7ffe4e7c18e19fe8e7439336bc6a4b6fbfd48;hb=d805903dbc99d803b8920a3f4b313dcb40148619;hp=7aba53ecf9d7bf90ca65686aca8774b0f3cdae1e;hpb=daa59351a9b39a0bb76a626b699250a52d6f7bc7;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 7aba53ec..3ba7ffe4 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -42,7 +42,11 @@ parameters: 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 @@ -154,6 +162,10 @@ parameters: type: string description: First element of the dns_list for ONAP network + dns_forwarder: + type: string + description: the forwarder address for setting up ONAP's private DNS server + oam_network_cidr: type: string description: CIDR of the OAM ONAP network @@ -216,73 +228,57 @@ 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 DCAE is deployed - - dcaeos_openstack_region: - type: string - description: the region of the OpenStack instance where DCAE is deployed - - dcaeos_openstack_tenant_id: - type: string - description: the keystone URL of the OpenStack instance where DCAE is deployed - - dcaeos_openstack_username: + dnsaas_config_enabled: type: string - description: the username of the identity API of the OpenStack instance where DCAE is deployed + description: whether the DNSaaS configuration section is enabled - dcaeos_openstack_password: + dnsaas_region: type: string - description: the password of the identity API of the OpenStack instance where DCAE is deployed + description: the region of the cloud instance providing the Designate DNS as a Service - dcaeos_dcae_key_name: + dnsaas_keystone_url: type: string - description: the key-pair name uploaded to the OpenStack instance where DCAE is deployed + description: the keystone URL of the cloud instance providing the Designate DNS as a Service - dcaeos_dcae_pub_key: + dnsaas_username: type: string - description: the public key of the key-pair uploaded to the OpenStack instance where DCAE is deployed + description: the username of the cloud instance providing the Designate DNS as a Service - dcaeos_private_key: + dnsaas_password: type: string - description: the private key of the key-pair uploaded to the OpenStack instance where DCAE is deployed + description: the password of the cloud instance providing the Designate DNS as a Service - dcaeos_openstack_private_network_name: + dnsaas_tenant_name: type: string - description: the name/id of the network used as DCAE internal network in the OpenStack instance where DCAE is deployed + description: the name of the tenant in the cloud instance providing the Designate DNS as a Service - dcaeos_public_net_id: + dcae_keystone_url: type: string - description: the name/id of the network where DCAE gets floating IPs from in the OpenStack instance where DCAE is deployed + description: the keystone URL for DCAE to use (via MultiCloud) - dcaeos_ubuntu_1604_image: + dcae_private_key: type: string - description: the name/id of the Ubuntu1604 VM image in the OpenStack instance where DCAE is deployed + description: the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs - dcaeos_centos_7_image: + dcae_public_key: type: string - description: the name/id of the CentOS7 VM image in the OpenStack instance where DCAE is deployed + description: the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs - dcaeos_security_group: + dcae_centos_7_image: type: string - description: the name/id of the security group to be used by DCAE VMs in the OpenStack instance where DCAE is deployed + description: the id/name of the CentOS 7 VM imange - dcaeos_flavor_id: + dcae_domain: type: string - description: the name/id of the VM flavor to be used by DCAE VMs in the OpenStack instance where DCAE is deployed + description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain) # dcae_base_environment: # type: string # description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS) - dcae_zone: - type: string - description: DCAE Zone to use in VM names created by DCAE controller +# dcae_zone: +# type: string +# description: DCAE Zone to use in VM names created by DCAE controller # dcae_state: # type: string @@ -422,7 +418,6 @@ resources: properties: length: 4 - # Public key used to access ONAP components vm_key: type: OS::Nova::KeyPair @@ -436,6 +431,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 @@ -522,6 +547,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 @@ -548,6 +574,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 @@ -1704,7 +1731,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 +1740,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 } @@ -1734,40 +1762,53 @@ resources: __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_xlarge } + __dcaeos_flavor_id_cdap__: { get_param: flavor_xlarge } + __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] } @@ -1793,46 +1834,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