X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fconfig%2Fdocker%2Finit%2Fsrc%2Fconfig%2Fdcaegen2%2Fheat%2Fonap_dcae.env;h=6b7caadbf3846f332b0d4bdfc9708d65395c6ed5;hb=f6c0855f03b99fcca9f411370221fe9ffa48e889;hp=363de40526bdec5e89ed354738e872dd3f406cdb;hpb=bbfe29d8cabfd347fa75e947a5753f7aa9a24177;p=oom.git

diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
index 363de40526..6b7caadbf3 100644
--- a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
+++ b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
@@ -6,19 +6,19 @@ parameters:
   #                                            #
   ##############################################
 
-  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
+  public_net_id: DCAE_OS_PUBLIC_NET_ID_HERE
 
-  public_net_name: OPENSTACK_PUBLIC_NET_NAME_HERE
+  public_net_name: DCAE_OS_PUBLIC_NET_NAME_HERE
 
   ubuntu_1404_image: UBUNTU_14_IMAGE_NAME_HERE
 
   ubuntu_1604_image: UBUNTU_16_IMAGE_NAME_HERE
 
-  flavor_small: OPENSTACK_FLAVOUR_SMALL_HERE
+  flavor_small: OPENSTACK_FLAVOR_SMALL_HERE
 
-  flavor_medium: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  flavor_medium: OPENSTACK_FLAVOR_MEDIUM_HERE
 
-  flavor_large: OPENSTACK_FLAVOUR_LARGE_HERE
+  flavor_large: OPENSTACK_FLAVOR_LARGE_HERE
 
   vm_base_name: DCAE_VM_BASE_NAME_HERE
 
@@ -36,17 +36,17 @@ parameters:
 
   artifacts_version: DEMO_ARTIFACTS_VERSION_HERE
 
-  openstack_tenant_id:  OPENSTACK_TENANT_ID_HERE
+  openstack_tenant_id:  DCAE_OS_TENANT_ID_HERE
 
-  openstack_tenant_name: OPENSTACK_TENANT_NAME_HERE
+  openstack_tenant_name: DCAE_OS_TENANT_NAME_HERE
 
-  openstack_username: OPENSTACK_USERNAME_HERE
+  openstack_username: DCAE_OS_USERNAME_HERE
 
-  openstack_api_key: OPENSTACK_PASSWORD_HERE
+  openstack_api_key: DCAE_OS_PASSWORD_HERE
 
-  openstack_region: OPENSTACK_REGION_HERE
+  openstack_region: DCAE_OS_REGION_HERE
 
-  keystone_url: OPENSTACK_KEYSTONE_IP_HERE
+  keystone_url: DCAE_OS_KEYSTONE_URL_HERE
 
   cloud_env: openstack
 
@@ -59,7 +59,7 @@ parameters:
   dns_list: DNS_LIST_HERE
   external_dns: EXTERNAL_DNS_HERE
   dns_forwarder: DNS_FORWARDER_HERE
-  oam_network_cidr: NETWORK_CIDR_WITH_ONAP_ROUTE_HERE
+  oam_network_cidr: DCAE_OS_OAM_NETWORK_CIDR_HERE
 
   ### Private IP addresses ###
 
@@ -85,7 +85,7 @@ parameters:
   dnsaas_tenant_name: DNSAAS_TENANT_NAME_HERE
   dnsaas_username: DNSAAS_USERNAME_HERE
   dnsaas_password: DNSAAS_PASSWORD_HERE
-  dcae_keystone_url: DCAE_KEYSTONE_URL_HERE
+  dcae_keystone_url: DCAE_FINAL_KEYSTONE_URL_HERE
   dcae_centos_7_image: OPENSTACK_CENTOS_7_IMAGE_HERE
   dcae_domain: DCAE_DOMAIN_HERE
   dcae_public_key: OPENSTACK_PUB_KEY_HERE