From 3a3ef86fb41279cc399d5e2539bdda102ba570cb Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Thu, 20 Sep 2018 03:21:04 -0700 Subject: [PATCH] Update OOF to v14 AAI schema Updated the version to v14 in conductor.conf Change-Id: I3cf3dd931d00aedc203c9a8d21d7a38ab36b5f7b Issue-ID: OPTFRA-355 Signed-off-by: Dileep Ranganathan --- .gitignore | 2 ++ heat/ONAP/cloud-config/oof_vm_init.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d58afb49..13673530 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ .DS_Store target/ *~ +.idea +*.iml diff --git a/heat/ONAP/cloud-config/oof_vm_init.sh b/heat/ONAP/cloud-config/oof_vm_init.sh index 4654ffbb..232aef58 100644 --- a/heat/ONAP/cloud-config/oof_vm_init.sh +++ b/heat/ONAP/cloud-config/oof_vm_init.sh @@ -116,14 +116,14 @@ MUSIC_URL=$(docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddre # Run OOF-HAS # Set A&AI and MUSIC url inside OOF-HAS conductor.conf -sed -i "138 s%.*%server_url = https://aai.api.simpledemo.onap.org:8443/aai%" $COND_CONF -sed -i "141 s%.*%server_url_version = v13%" $COND_CONF -sed -i "257 s%.*%server_url = http://$MUSIC_URL:8080/MUSIC/rest/v2%" $COND_CONF -sed -i "284 s%.*%replication_factor = 1%" $COND_CONF -sed -i "359 s%.*%server_url = http://msb.api.simpledemo.onap.org/api/multicloud%" $COND_CONF +sed -i "160 s%.*%server_url = https://aai.api.simpledemo.onap.org:8443/aai%" $COND_CONF +sed -i "163 s%.*%server_url_version = v14%" $COND_CONF +sed -i "279 s%.*%server_url = http://$MUSIC_URL:8080/MUSIC/rest/v2%" $COND_CONF +sed -i "306 s%.*%replication_factor = 1%" $COND_CONF +sed -i "381 s%.*%server_url = http://msb.api.simpledemo.onap.org/api/multicloud%" $COND_CONF # Set A&AI authentication file locations inside OOF-HAS conductor.conf -sed -i "153 s%.*%certificate_authority_bundle_file = $AAI_cert%" $COND_CONF +sed -i "175 s%.*%certificate_authority_bundle_file = $AAI_cert%" $COND_CONF echo "Values to data component" -- 2.16.6