X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=aad2d1e1333686382c69f016351407749c773120;hb=refs%2Fchanges%2F99%2F21299%2F1;hp=f199cba5a93bbc5751d3ddbe6746257492843b93;hpb=155b752b944d11b6213d1d5cae5194a52a4630a9;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index f199cba5..aad2d1e1 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -12,8 +12,6 @@ parameters:
 
   ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
 
-  centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE
-
   flavor_small: PUT THE SMALL FLAVOR NAME HERE
 
   flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
@@ -24,18 +22,12 @@ parameters:
 
   flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
 
-  security_group: PUT THE NAME OF THE SECURITY GROUP HERE
-
   vm_base_name: vm1
 
   key_name: onap_key
 
-  dcae_key_name: dcae_key
-
   pub_key: PUT YOUR PUBLIC KEY HERE
 
-  dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE
-
   nexus_repo: https://nexus.onap.org/content/sites/raw
 
   nexus_docker_repo: nexus3.onap.org:10001
@@ -98,11 +90,11 @@ parameters:
   clamp_ip_addr: 10.0.12.1
   openo_ip_addr: 10.0.14.1
 
-  dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE
-  dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE
-  dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE
-  dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE
-  dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE
+#  dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE
+#  dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE
+#  dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE
+#  dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE
+#  dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE
 
   ###########################
   #                         #
@@ -110,20 +102,32 @@ parameters:
   #                         #
   ###########################
 
-  dcae_base_environment: 1-NIC-FLOATING-IPS
-
-  dcae_zone: ZONE
+#  dcae_base_environment: 1-NIC-FLOATING-IPS
 
-  dcae_state: STATE
+#  dcae_zone: ZONE
 
-  nexus_repo_root: https://nexus.onap.org
+#  dcae_state: STATE
 
-  nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
+#  nexus_repo_root: https://nexus.onap.org
 
-  gitlab_branch: master
+#  nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
 
-  dcae_code_version: 1.1.0
+#  gitlab_branch: master
 
+#  dcae_code_version: 1.1.0
+  
+  dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
+  dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
+  dnsaas_tenant_id: PUT THE DESIGNATE PROVIDING OPENSTACK'S DEFAULT TENANT HERE
+  dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
+  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_security_group: PUT THE SECURITY GROUP NAME HERE FOR DCAE LAUNCHED VMS
+  dcae_key_name: PUT THE ON BOARDED KEY-PAIR NAME HERE FOR DCAE LAUNCHED VMS
+  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
 
   ################################
   #                              #
@@ -137,7 +141,7 @@ parameters:
   mr_branch: master
   dcae_branch: master
   policy_branch: master
-  portal_branch: master
+  portal_branch: release-1.3.0
   robot_branch: master
   sdc_branch: master
   sdnc_branch: master
@@ -161,6 +165,7 @@ parameters:
   mvim_docker: latest
   vfc_docker: latest
   uui_docker: latest
+  esr_docker: latest
   dgbuilder_docker: 0.1-STAGING-latest
   cli_docker: 1.1-STAGING-latest