From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 16 Sep 2016 15:29:25 +0000 (-0500)
Subject: modfiied to untar the scaleio charms.
X-Git-Tag: danube.1.0~169
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F21279%2F2;p=joid.git

modfiied to untar the scaleio charms.

Change-Id: I20d0dd0f982cf60a79e7daca082c13b04bee87c0
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 9242ebba..536fd055 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -19,6 +19,9 @@ sed -i -- "s|distro=trusty|distro=$opnfvdistro|g" ./fetch-charms.sh
 
 ./fetch-charms.sh $opnfvdistro
 
+mkdir trusty
+tar xvf common/scaleio.tar -C ./trusty/ --strip=2 juju-scaleio/trusty/
+
 osdomname=''
 
 #check whether charms are still executing the code even juju-deployer says installed.
diff --git a/ci/config_tpl/bundle_tpl/odl.yaml b/ci/config_tpl/bundle_tpl/odl.yaml
index d04049f2..257f3b67 100644
--- a/ci/config_tpl/bundle_tpl/odl.yaml
+++ b/ci/config_tpl/bundle_tpl/odl.yaml
@@ -1,7 +1,7 @@
     odl-controller:
       charm: local:{{ ubuntu.release }}/odl-controller
       options:
-        install-url: "https://nexus.opendaylight.org/content/repositories/autorelease-1495/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz"
+        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz"
 {% if os.network.sfc %}
         profile: "openvswitch-odl-beryllium-sfc"
 {% elif os.network.bgpvpn %}