From 397a65dcb0d6b9afb9165f5f13f0f717d449c374 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Mon, 2 Oct 2017 22:36:16 -0400 Subject: [PATCH 1/1] update ro-config line for R3 Change-Id: I9738da58dfe6ac622e2066efe4df9704443727ef Signed-off-by: Mike Marchetti --- installers/install_osm.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/installers/install_osm.sh b/installers/install_osm.sh index f9031750..e475c3fd 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -209,13 +209,22 @@ function configure(){ --data '{"account": [ { "name": "osmjuju", "account-type": "juju", "juju": { "ip-address": "'$JUJU_CONTROLLER_IP'", "port": "17070", "user": "admin", "secret": "'$JUJU_PASSWD'" } } ]}') [[ $result =~ .*success.* ]] || FATAL "Failed config-agent configuration: $result" + #R1/R2 config line + #result=$(curl -k --request PUT \ + # --url https://$SO_CONTAINER_IP:8008/api/config/resource-orchestrator \ + # --header 'accept: application/vnd.yang.data+json' \ + # --header 'authorization: Basic YWRtaW46YWRtaW4=' \ + # --header 'cache-control: no-cache' \ + # --header 'content-type: application/vnd.yang.data+json' \ + # --data '{ "openmano": { "host": "'$RO_CONTAINER_IP'", "port": "9090", "tenant-id": "'$RO_TENANT_ID'" }, "name": "osmopenmano", "account-type": "openmano" }') + result=$(curl -k --request PUT \ - --url https://$SO_CONTAINER_IP:8008/api/config/resource-orchestrator \ + --url https://$SO_CONTAINER_IP:8008/api/config/project/default/ro-account/account \ --header 'accept: application/vnd.yang.data+json' \ --header 'authorization: Basic YWRtaW46YWRtaW4=' \ - --header 'cache-control: no-cache' \ + --header 'cache-control: no-cache' \ --header 'content-type: application/vnd.yang.data+json' \ - --data '{ "openmano": { "host": "'$RO_CONTAINER_IP'", "port": "9090", "tenant-id": "'$RO_TENANT_ID'" }, "name": "osmopenmano", "account-type": "openmano" }') + --data '{"rw-ro-account:account": [ { "openmano": { "host": "'$RO_CONTAINER_IP'", "port": "9090", "tenant-id": "'$RO_TENANT_ID'"}, "name": "osmopenmano", "ro-account-type": "openmano" }]}') [[ $result =~ .*success.* ]] || FATAL "Failed resource-orchestrator configuration: $result" } -- 2.25.1