From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 30 Aug 2017 14:49:23 +0000 (-0500)
Subject: change the charm version to latest for rados-gw as well.
X-Git-Tag: opnfv-5.0.RC1~23
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F40705%2F1;p=joid.git

change the charm version to latest for rados-gw as well.

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

diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index c3131c6b..10b492af 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -17,7 +17,7 @@ git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
 git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
 git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone https://github.com/openstack/charm-cinder.git $distro/cinder
 git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
 git clone https://github.com/openstack/charm-glance.git $distro/glance
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index df000880..2bf59527 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -11,15 +11,13 @@ function build {
 
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
-bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
-bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 
 git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster
 git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
 git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
 git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone https://github.com/openstack/charm-cinder.git $distro/cinder
 git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
 git clone https://github.com/openstack/charm-glance.git $distro/glance
@@ -37,6 +35,8 @@ git clone https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
 charm pull cs:$distro/aodh $distro/aodh
+charm pull cs:$distro/mongodb $distro/mongodb
+charm pull cs:$distro/ntp $distro/ntp
 
 #pulling scaleio charms.
 charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm