X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=9fd89ee223650510dbd01def15055e52b6675522;hb=57e593994acfc8426dbb1a0f21b6e365acf35e1f;hp=f8cfe97509454ad962f64265745ab4ab093a9e5a;hpb=6806feb56f74281fd13f89002885617b8ba36f3b;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index f8cfe975..9fd89ee2 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
@@ -40,7 +36,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.2.0
+  artifacts_version: 1.2.1-SNAPSHOT
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
@@ -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)
 
   ################################
   #                              #
@@ -125,7 +108,7 @@ parameters:
   appc_branch: master
   so_branch: master
   mr_branch: master
-  policy_branch: master
+  policy_branch: beijing
   portal_branch: master
   robot_branch: master
   sdc_branch: master
@@ -139,16 +122,16 @@ 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
+  policy_docker: 1.2.3
   portal_docker: v2.2.0
-  robot_docker: 1.2.0
+  robot_docker: 1.2.1
   sdc_docker: 1.2-STAGING-latest
   sdnc_docker: 1.3-STAGING-latest
-  vid_docker: 1.2.1
+  vid_docker: 2.0.0
   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,20 +148,20 @@ parameters:
   nbi_docker: latest
   dbcl_docker: latest
 
-  dcae_docker:  1.1.2
-  dcae_snmptrap_docker:  latest
-  dcae_ves_docker:  latest
-  dcae_bootstrap_docker: 1.1.2
-  dcae_cm_docker: latest
-  dcae_k8sbootstrap_docker: latest
-  dcae_redisc_docker: latest
-  dcae_tca_docker: latest
-  dcae_cb_docker: v4.0.0
-  dcae_cbs_docker: latest
-  dcae_dh_docker: latest
-  dcae_inv_docker: latest
-  dcae_ph_docker: latest
-  dcae_sch_docker: latest
+  dcae_docker:  1.1.3
+  dcae_snmptrap_docker:  1.3.0
+  dcae_ves_docker:  1.2.0
+  dcae_bootstrap_docker: 1.1.3
+  dcae_cm_docker: 1.3.0
+  dcae_k8sbootstrap_docker: 1.1.11
+  dcae_redisc_docker: 1.0.0
+  dcae_tca_docker: 1.1.0
+  dcae_cb_docker: 4.1.0
+  dcae_cbs_docker: 2.1.5
+  dcae_dh_docker: 2.1.5
+  dcae_inv_docker: 3.0.1
+  dcae_ph_docker: 2.4.5
+  dcae_sch_docker: 1.1.4
   dcae_heartbeat_docker: latest
   dcae_prh_docker: latest
   holmes_rm_docker: latest