X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=3a64fca7502b65de967d419cf60a80305839e477;hb=c0e48e2923af5ea1e77d8741d695ce5553d22ab3;hp=97f01922d86e53294a75e0f4c56f427eb20a367e;hpb=ba2ea344e2a3335739cee2eb1dcb6f1454f58a3a;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 97f01922..3a64fca7 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -6,14 +6,14 @@ parameters:
   #                                            #
   ##############################################
 
-  public_net_id: PUT YOUR NETWORK ID/NAME HERE
+  public_net_id: PUT YOUR NETWORK ID HERE
+
+  public_net_name: PUT YOUR NETWORK NAME HERE
 
   ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE
 
   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 +24,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
@@ -50,6 +44,8 @@ parameters:
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
+  openstack_tenant_name: PUT YOUR OPENSTACK PROJECT NAME HERE
+
   openstack_username: PUT YOUR OPENSTACK USERNAME HERE
 
   openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE
@@ -73,6 +69,7 @@ parameters:
 
   dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
   external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
+  dns_forwarder: PUT THE IP OF DNS FORWARDER FOR ONAP DEPLOYMENT'S OWN DNS SERVER
   oam_network_cidr: 10.0.0.0/16
 
   ### Private IP addresses ###
@@ -98,11 +95,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 +107,31 @@ 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_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
 
   ################################
   #                              #
@@ -137,7 +145,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
@@ -151,17 +159,19 @@ parameters:
   mr_docker: 1.1-STAGING-latest
   dcae_docker: 1.1-latest
   policy_docker: 1.1-STAGING-latest
-  portal_docker: 1.3-STAGING-latest
+  portal_docker: v1.3.0
   robot_docker: 1.1-STAGING-latest
   sdc_docker: 1.1-STAGING-latest
-  sdnc_docker: 1.2-SNAPSHOT-latest
+  sdnc_docker: 1.2-STAGING-latest
   vid_docker: 1.1-STAGING-latest
   clamp_docker: 1.1-STAGING-latest
   msb_docker: latest
   mvim_docker: latest
   vfc_docker: latest
   uui_docker: latest
+  esr_docker: latest
   dgbuilder_docker: 0.1-STAGING-latest
+  cli_docker: v1.1.0
 
   #####################
   #                   #