From bad19ac0b6167d5a3a977e8fa29fcc89887981ba Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 4 Oct 2016 16:35:57 +0200 Subject: [PATCH] install_from_source updated once again to change curl instructions and committ-id be checked (tag) Change-Id: I61bb1e15d562d347942dcb541d501f7d200b8e8a Signed-off-by: garciadeblas --- installers/install_from_source | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/installers/install_from_source b/installers/install_from_source index c57897e9..1f0ced7b 100755 --- a/installers/install_from_source +++ b/installers/install_from_source @@ -87,7 +87,9 @@ echo -e " Required root privileges" sudo apt install -y git wget curl tar echo -e "\nCreating the containers and building ..." -COMMIT_ID="master" +COMMIT_ID="tags/v1.0" +#COMMIT_ID="master" +[ -n "$DEVELOP" ] && COMMIT_ID="master" $OSM_DEVOPS/jenkins/host/start_build RO checkout $COMMIT_ID $OSM_DEVOPS/jenkins/host/start_build VCA $OSM_DEVOPS/jenkins/host/start_build SO checkout $COMMIT_ID @@ -115,13 +117,21 @@ JUJU_CONTROLLER_IP=`lxc exec VCA -- lxc list -c 4 |grep eth0 |awk '{print $2}'` echo -e " Configuring SO" sudo route add -host $JUJU_CONTROLLER_IP gw $VCA_CONTAINER_IP -#lxc exec SO-ub -- nohup sudo -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode & -lxc exec SO-ub -- nohup sudo -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode +lxc exec SO-ub -- nohup sudo -b -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode sleep 60 #lxc exec SO-ub -- resource-orchestrator name openmano account-type openmano openmano host $RO_CONTAINER_IP tenant-id $RO_TENANT_ID port 9090 #lxc exec SO-ub -- config-agent account juju account-type juju juju ip-address $JUJU_CONTROLLER_IP port 17070 user admin secret $JUJU_PASSWD #curl --request POST --url http://$SO_CONTAINER_IP:8008/api/config/config-agent --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 '{\n "account": [\n {\n "name": "osmjuju",\n "juju": {\n "ip-address": "$JUJU_CONTROLLER_IP",\n "port": "17070",\n "user": "admin",\n "secret": "$JUJU_PASSWD"\n }\n }\n ]\n}' +curl -k --request POST \ + --url https://$SO_CONTAINER:8008/api/config/config-agent \ + --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 '{\n "account": [\n {\n "name": "osmjuju",\n "account-type": "juju",\n "juju": {\n "ip-address": " $JUJU_CONTROLLER_IP",\n "port": "17070",\n "user": "-admin",\n "secret": "$JUJU_PASSWD"\n }\n }\n ]\n}' + #curl --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 '{\n "openmano": {\n "host": "$RO_CONTAINER_IP",\n "port": "9090",\n "tenant-id": "$RO_TENANT_ID"\n },\n "name": "osmopenmano",\n "account-type": "openmano"\n}' +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 '{\n "openmano": {\n "host": "$RO_CONTAINER_IP",\n "port": "9090",\n "tenant-id": "$RO_TENANT_ID"\n },\n "name": "osmopenmano",\n "account-type": "openmano"\n}' echo -e "\nDONE" -- 2.25.1