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

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 06c09b9d..3a64fca7 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -6,7 +6,9 @@ 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
 
@@ -42,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
@@ -65,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 ###
@@ -104,7 +109,7 @@ parameters:
 
 #  dcae_base_environment: 1-NIC-FLOATING-IPS
 
-  dcae_zone: ZONE
+#  dcae_zone: ZONE
 
 #  dcae_state: STATE
 
@@ -115,23 +120,18 @@ parameters:
 #  gitlab_branch: master
 
 #  dcae_code_version: 1.1.0
-
-  dcaeos_cloud_env: PUT DCAE TARGET DEPLOYMENT STACK'S FLAVOR (e.g. openstack) HERE
-  dcaeos_keystone_url: PUT DCAE TARGET DEPLOYMENT STACK'S KEYSTONE URL HERE
-  dcaeos_openstack_region: PUT DCAE TARGET DEPLOYMENT STACK'S REGION HERE
-  dcaeos_openstack_tenant_id: PUT DCAE TARGET DEPLOYMENT STACK'S TENANT ID HERE
-  dcaeos_openstack_username: PUT DCAE TARGET DEPLOYMENT STACK'S USERNAME HERE
-  dcaeos_openstack_password: PUT DCAE TARGET DEPLOYMENT STACK'S PASSWORD HERE
-  dcaeos_dcae_key_name: PUT DCAE TARGET DEPLOYMENT STACK'S UPLOADED KEY-PAIR NAME HERE
-  dcaeos_dcae_pub_key: PUT DCAE TARGET DEPLOYMENT STACK'S PUBLIC KEY HERE
-  dcaeos_private_key: PUT DCAE TARGET DEPLOYMENT STACK'S PRIVATE KEY HERE
-  dcaeos_openstack_private_network_name: PUT DCAE TARGET DEPLOYMENT STACK'S INTERNAL NETWOKR ID HERE
-  dcaeos_public_net_id: PUT DCAE TARGET DEPLOYMENT STACK'S PUBLIC NETWORK ID HERE
-  dcaeos_ubuntu_1604_image: PUT DCAE TARGET DEPLOYMENT STACK'S UBUNTU1604 IMAGE ID (TO BE USED BY DCAE VMS) HERE
-  dcaeos_centos_7_image: PUT DCAE TARGET DEPLOYMENT STACK'S CENTOS7 IMAGE ID (TO BE USED BY DCAE VMS) HERE
-  dcaeos_security_group: PUT DCAE TARGET DEPLOYMENT STACK'S SECURITY GROUP ID (TO BE USED BY DCAE VMS) HERE
-  dcaeos_flavor_id: PUT DCAE TARGET DEPLOYMENT STACK'S VM FLAVOR ID (TO BE USED BY DCAE VMS) HERE
-
+  
+  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
 
   ################################
   #                              #
@@ -145,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
@@ -159,7 +159,7 @@ 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-STAGING-latest
@@ -171,7 +171,7 @@ parameters:
   uui_docker: latest
   esr_docker: latest
   dgbuilder_docker: 0.1-STAGING-latest
-  cli_docker: 1.1-STAGING-latest
+  cli_docker: v1.1.0
 
   #####################
   #                   #