Merge "Update final policy 1.2.3 image"

diff --git a/boot/oof_vm_init.sh b/boot/oof_vm_init.sh
index 241c484..f7ce92d 100644 (file)
--- a/boot/oof_vm_init.sh
+++ b/boot/oof_vm_init.sh
@@ -94,7 +94,7 @@ osdfCMSchedulerPassword: testpwd1
 
 NEWFILE
 
-docker run -d --name osdf -v $OSDF_CONFIG:/optf/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMAGE_NAME}:latest
+docker run -d --name osdf -v $OSDF_CONFIG:/opt/app/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMAGE_NAME}:latest
 
 # install MUSIC
 # create directory for music properties and logs

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index da446ad..3bb9f97 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -122,8 +122,8 @@ parameters:
   sms_branch: master
   oof_branch: master
 
-  aai_docker: 1.2-STAGING-latest
-  aai_sparky_docker: 1.2-STAGING-latest
+  aai_docker: 1.2.1
+  aai_sparky_docker: 1.2.1
   appc_docker: 1.3.0-SNAPSHOT-latest
   so_docker: 1.2.1
   policy_docker: 1.2.3
@@ -131,7 +131,7 @@ parameters:
   robot_docker: 1.2.0
   sdc_docker: 1.2-STAGING-latest
   sdnc_docker: 1.3-STAGING-latest
-  vid_docker: 1.2.1
+  vid_docker: 2.0-STAGING-latest
   clamp_docker: 2.0-STAGING-latest
   msb_docker: 1.1.0-STAGING-latest
   mvim_docker: 1.1.2-STAGING
@@ -148,10 +148,10 @@ parameters:
   nbi_docker: latest
   dbcl_docker: latest
 
-  dcae_docker:  1.1.2
+  dcae_docker:  1.1.3
   dcae_snmptrap_docker:  latest
   dcae_ves_docker:  latest
-  dcae_bootstrap_docker: 1.1.2
+  dcae_bootstrap_docker: 1.1.3
   dcae_cm_docker: latest
   dcae_k8sbootstrap_docker: latest
   dcae_redisc_docker: latest

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index e0180c9..b6ae8ee 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -22,8 +22,6 @@ parameters:
 
   flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
 
-  flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
-
   vm_base_name: onap
 
   key_name: onap_key
@@ -52,8 +50,6 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: PUT THE HORIZON URL HERE
-
   keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
 
   cloud_env: openstack