X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=98848c4ff1397eb96dca43735ca4d6eaf94aef7f;hb=3f5434179d1721dc8f201b687910e9193ff38622;hp=2316816e29f58cf10359274d598d2278b496dddf;hpb=88eeb55cade0caf1fbde24ec9012439b2a9d58c3;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 2316816e..98848c4f 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -72,10 +72,6 @@ parameters: type: string description: Name of the Extra Large Flavor supported by the cloud provider - flavor_xxlarge: - type: string - description: Name of the Extra Extra Large Flavor supported by the cloud provider - vm_base_name: type: string description: Base name of ONAP VMs @@ -133,10 +129,6 @@ parameters: type: string description: OpenStack password or API Key - horizon_url: - type: string - description: URL of OpenStack Horizon - keystone_url: type: string description: URL of OpenStack Keystone @@ -226,51 +218,63 @@ parameters: dcae_deployment_profile: type: string - description: DCAE deployment profile. Currently supported profiles R1, R2MVP. + default: R2 + description: DCAE deployment profile. Currently supported profiles R2, R2MVP, and R2PLUS. dnsaas_config_enabled: type: string - description: whether the DNSaaS configuration section is enabled + default: "" + description: (deprecated in R2) whether the DNSaaS configuration section is enabled dnsaas_region: type: string - description: the region of the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the region of the cloud instance providing the Designate DNS as a Service dnsaas_keystone_url: type: string - description: the keystone URL of the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the keystone URL of the cloud instance providing the Designate DNS as a Service dnsaas_username: type: string - description: the username of the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the username of the cloud instance providing the Designate DNS as a Service dnsaas_password: type: string - description: the password of the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the password of the cloud instance providing the Designate DNS as a Service dnsaas_tenant_name: type: string - description: the name of the tenant in the cloud instance providing the Designate DNS as a Service + 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 - description: the keystone URL for DCAE to use (via MultiCloud) + default: "" + description: (deprecated in R2) the keystone URL for DCAE to use (via MultiCloud) dcae_private_key: type: string - description: the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs + 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 - description: the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs + 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 - description: the id/name of the CentOS 7 VM imange + default: "" + description: (deprecated in R2) the id/name of the CentOS 7 VM imange dcae_domain: type: string - description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain) + default: "" + description: (deprecated in R2) the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain) ##################### # # @@ -406,6 +410,8 @@ parameters: type: string robot_docker: type: string + sniro_docker: + type: string sdc_docker: type: string sdc_wfd_docker: @@ -432,7 +438,11 @@ parameters: type: string music_docker: type: string - oof_docker: + cassandra_music_docker: + type: string + optf_has_docker: + type: string + optf_osdf_docker: type: string aaf_docker: type: string @@ -1082,6 +1092,7 @@ resources: __script_version__: { get_param: artifacts_version } __robot_repo__: { get_param: robot_repo } __docker_version__: { get_param: robot_docker } + __sniro_docker_version__: { get_param: sniro_docker } __vnf_pub_key__: { get_param: pub_key } __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot } template: | @@ -1100,6 +1111,7 @@ resources: echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__keystone_url__" > /opt/config/keystone.txt @@ -2156,7 +2168,10 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: oof_docker } + __has_docker_version__: { get_param: optf_has_docker } + __osdf_docker_version__: { get_param: optf_osdf_docker } + __music_docker_version__: { get_param: music_docker } + __cass_music_docker_version__: { get_param: cassandra_music_docker } __oof_repo__: { get_param: oof_repo } __gerrit_branch__: { get_param: oof_branch } __cloud_env__: { get_param: cloud_env } @@ -2172,7 +2187,10 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.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 + echo "__has_docker_version__" > /opt/config/has_docker_version.txt + echo "__osdf_docker_version__" > /opt/config/osdf_docker_version.txt + echo "__music_docker_version__" > /opt/config/music_version.txt + echo "__cass_music_docker_version__" > /opt/config/cass_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