X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=8ee8423d938d69aeb6f2315e088c80ac1be287b6;hb=491628b6f98298535d6b98c668f28c955f792d16;hp=c1eb4f490058587d4ff1cd695d35550a84df4163;hpb=641b19e5fddf06de6b047590586478404e414899;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index c1eb4f49..8ee8423d 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -22,16 +22,12 @@ parameters:
 
   flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
 
-  flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
-
   vm_base_name: onap
 
   key_name: onap_key
 
   pub_key: PUT YOUR PUBLIC KEY HERE
 
-  nexus_repo: https://nexus.onap.org/content/sites/raw
-
   nexus_docker_repo: nexus3.onap.org:10001
 
   nexus_username: docker
@@ -54,8 +50,6 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: PUT THE HORIZON URL HERE
-
   keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
 
   cloud_env: openstack
@@ -101,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)
 
   ################################
   #                              #
@@ -139,8 +122,8 @@ parameters:
   sms_branch: master
   oof_branch: master
 
-  aai_docker: 1.2-STAGING-latest
-  aai_sparky_docker: 1.2-STAGING-latest
+  aai_docker: 1.2.1
+  aai_sparky_docker: 1.2.1
   appc_docker: 1.3.0-SNAPSHOT-latest
   so_docker: 1.2.1
   policy_docker: 1.2.2
@@ -148,7 +131,7 @@ parameters:
   robot_docker: 1.2.0
   sdc_docker: 1.2-STAGING-latest
   sdnc_docker: 1.3-STAGING-latest
-  vid_docker: 1.2.1
+  vid_docker: 2.0-STAGING-latest
   clamp_docker: 2.0-STAGING-latest
   msb_docker: 1.1.0-STAGING-latest
   mvim_docker: 1.1.2-STAGING
@@ -157,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
@@ -165,10 +148,10 @@ parameters:
   nbi_docker: latest
   dbcl_docker: latest
 
-  dcae_docker:  1.1.2
+  dcae_docker:  1.1.3
   dcae_snmptrap_docker:  latest
   dcae_ves_docker:  latest
-  dcae_bootstrap_docker: 1.1.2
+  dcae_bootstrap_docker: 1.1.3
   dcae_cm_docker: latest
   dcae_k8sbootstrap_docker: latest
   dcae_redisc_docker: latest