Docker images version v1.3.0 for Portal

[demo.git] / heat / ONAP / onap_openstack.env

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index aad2d1e..3a64fca 100644 (file)
--- 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 ###
@@ -118,14 +123,13 @@ parameters:
   
   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_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_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_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
 
@@ -155,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
@@ -167,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
 
   #####################
   #                   #