Remove deprecated R1 code

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

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 5ca2b54..4deabdf 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -44,9 +44,7 @@ parameters:
 
   openstack_username: PUT YOUR OPENSTACK USERNAME HERE
 
-  openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE
-
-  openstack_auth_method: password
+  openstack_api_key: PUT YOUR ENCRYPTED OPENSTACK PASSWORD HERE
 
   openstack_region: RegionOne
 
@@ -99,7 +97,7 @@ parameters:
   #                         #
   ###########################
 
-  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS)
+  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R3MVP, R3, or R3PLUS)
 
   ################################
   #                              #
@@ -127,7 +125,7 @@ parameters:
 
   aai_docker: "${AAI_RESOURCES_DOCKER}"
   appc_docker: "${APPC_IMAGE_DOCKER}"
-  so_docker: "${MSO_DOCKER}"
+  so_docker: "${API_HANDLER_INFRA_DOCKER}"
   policy_docker: "${POLICY_PE_DOCKER}"
   portal_docker: "${PORTAL_APP_DOCKER}"
   robot_docker: "${TESTSUITE_DOCKER}"
@@ -156,6 +154,8 @@ parameters:
   dcae_docker: "${BOOTSTRAP_DOCKER}"
   dcae_snmptrap_docker: "${SNMPTRAP_DOCKER}"
   dcae_ves_docker: "${VESCOLLECTOR_DOCKER}"
+  dcae_hvves_docker: "${HVVESCOLLECTOR_DOCKER}"
+  dcae_datafile_docker: "${DATAFILECOLLECTOR_DOCKER}"
   dcae_bootstrap_docker: "${BOOTSTRAP_DOCKER}"
   dcae_cm_docker: "${CM_CONTAINER_DOCKER}"
   dcae_k8sbootstrap_docker: "${K8S_BOOTSTRAP_CONTAINER_DOCKER}"