Merge "Set the CLI docker version to beijing"

[demo.git] / heat / ONAP / onap_openstack.env

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 68be91e..437a73c 100644 (file)
--- 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)
 
   ################################
   #                              #
@@ -151,7 +140,7 @@ parameters:
   esr_docker: latest
   sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
   dgbuilder_docker: 0.2-STAGING-latest
-  cli_docker: 2.0-STAGING-latest
+  cli_docker: 2.0.2
   music_docker: latest
   oof_docker: latest
   aaf_docker: 2.1.0-SNAPSHOT