X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=d7d290d06cf9b0e6d756f9b86c4b33110abeaf23;hb=995654ad4d923af5ad3639ae352beb5c6d29f65b;hp=b731a34e81edd705c0b970f644e6df32f7cc8c8d;hpb=f20f6a2f98ea2e794f309b90a0a6359802bf9faf;p=demo.git

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index b731a34e..d7d290d0 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.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-SNAPSHOT
+  artifacts_version: 1.2.1
 
   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)
 
   ################################
   #                              #
@@ -121,23 +104,23 @@ parameters:
   #                              #
   ################################
 
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
-  mr_branch: master
-  policy_branch: master
-  portal_branch: master
-  robot_branch: master
-  sdc_branch: master
-  sdnc_branch: master
-  vid_branch: master
-  clamp_branch: master
-  vnfsdk_branch: master
-  music_branch: master
-  nbi_branch: master
-  aaf_branch: master
-  sms_branch: master
-  oof_branch: master
+  aai_branch: beijing
+  appc_branch: beijing
+  so_branch: beijing
+  mr_branch: beijing
+  policy_branch: beijing
+  portal_branch: beijing
+  robot_branch: beijing
+  sdc_branch: beijing
+  sdnc_branch: beijing
+  vid_branch: beijing
+  clamp_branch: beijing
+  vnfsdk_branch: beijing
+  music_branch: beijing
+  nbi_branch: beijing
+  aaf_branch: beijing
+  sms_branch: beijing
+  oof_branch: beijing
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
@@ -146,6 +129,7 @@ parameters:
   policy_docker: ${POLICY_PE_DOCKER}
   portal_docker: ${PORTAL_APP_DOCKER}
   robot_docker: ${TESTSUITE_DOCKER}
+  sniro_docker: ${SNIROEMULATOR_DOCKER}
   sdc_docker: ${SDC_BACKEND_DOCKER}
   sdnc_docker: ${SDNC_IMAGE_DOCKER}
   vid_docker: ${VID_DOCKER}
@@ -159,7 +143,9 @@ parameters:
   dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER}
   cli_docker: ${CLI_DOCKER}
   music_docker: ${MUSIC_DOCKER}
-  oof_docker: ${OPTF_OSDF_DOCKER}
+  cassandra_music_docker: ${CASSANDRA_MUSIC_DOCKER}
+  optf_has_docker: ${OPTF_HAS_DOCKER}
+  optf_osdf_docker: ${OPTF_OSDF_DOCKER}
   aaf_docker: ${AAF_SERVICE_DOCKER}
   sms_docker: ${SMS_DOCKER}
   nbi_docker: ${NBI_DOCKER}
@@ -179,8 +165,6 @@ parameters:
   dcae_inv_docker: ${INVENTORY_API_DOCKER}
   dcae_ph_docker: ${POLICY_HANDLER_DOCKER}
   dcae_sch_docker: ${SERVICECHANGE_HANDLER_DOCKER}
-  dcae_heartbeat_docker: ${HEARTBEAT_DOCKER}
-  dcae_prh_docker: ${PRH_APP_SERVER_DOCKER}
   holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER}
   holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER}