diff options
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 13 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 36 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 13 |
3 files changed, 26 insertions, 36 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 68be91e6..3382d2a4 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -95,18 +95,7 @@ parameters: # # ########################### - dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1, R2MVP, R2, or R2PLUS) - dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE - dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE - dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE - dnsaas_tenant_name: PUT THE TENANT NAME IN THE DESIGNATE PROVIDING OPENSTACK HERE (FOR R1 USE THE SAME AS openstack_tenant_name) - dnsaas_username: PUT THE DESIGNATE PROVIDING OPENSTACK'S USERNAME HERE - dnsaas_password: PUT THE DESIGNATE PROVIDING OPENSTACK'S PASSWORD HERE - dcae_keystone_url: PUT THE MULTIVIM PROVIDED KEYSTONE API URL HERE - dcae_centos_7_image: PUT THE CENTOS7 VM IMAGE NAME HERE FOR DCAE LAUNCHED CENTOS7 VM - dcae_domain: PUT THE NAME OF DOMAIN THAT DCAE VMS REGISTER UNDER - dcae_public_key: PUT THE PUBLIC KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS - dcae_private_key: PUT THE SECRET KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS + dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS) ################################ # # diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 532f91e1..92f119ea 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -218,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) ##################### # # diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 6e448a3b..e0180c98 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -99,18 +99,7 @@ parameters: # # ########################### - dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1, R2MVP, R2, or R2PLUS) - dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE - dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE - dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE - dnsaas_tenant_name: PUT THE TENANT NAME IN THE DESIGNATE PROVIDING OPENSTACK HERE (FOR R1 USE THE SAME AS openstack_tenant_name) - dnsaas_username: PUT THE DESIGNATE PROVIDING OPENSTACK'S USERNAME HERE - dnsaas_password: PUT THE DESIGNATE PROVIDING OPENSTACK'S PASSWORD HERE - dcae_keystone_url: PUT THE MULTIVIM PROVIDED KEYSTONE API URL HERE - dcae_centos_7_image: PUT THE CENTOS7 VM IMAGE NAME HERE FOR DCAE LAUNCHED CENTOS7 VM - dcae_domain: PUT THE NAME OF DOMAIN THAT DCAE VMS REGISTER UNDER - dcae_public_key: PUT THE PUBLIC KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS - dcae_private_key: PUT THE SECRET KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS + dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS) ################################ # # |