summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-09-16 10:29:25 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-09-16 11:17:00 -0500
commitd2ca237a4e5c2e2cb6e2f7faa88895a50d979e50 (patch)
tree5d31a7f0968d41063bba0d870f36a4ad4603967b /ci
parentdfc43c69179c1305be42e524c2bfc357aaf87dfd (diff)
modfiied to untar the scaleio charms.
Change-Id: I20d0dd0f982cf60a79e7daca082c13b04bee87c0 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/02-deploybundle.sh3
-rw-r--r--ci/config_tpl/bundle_tpl/odl.yaml2
2 files changed, 4 insertions, 1 deletions
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 %}