X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ci%2Fopencontrail%2Ffetch-charms.sh;h=908f7c114e11ca801bb7a07b58d1ea13ea69fbc6;hb=d1aaa3704c4bb65a5f45ccfc1cb5d8bf18e6fb32;hp=555009496fbf01567bb533de014694a9b1cfc4cd;hpb=44db065d7944b02b6948fbda4e504d6e9df0f640;p=joid.git

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 55500949..908f7c11 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -21,8 +21,9 @@ git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress
 
 git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+#bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer
+#git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+#git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
 git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph
 git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
@@ -62,15 +63,8 @@ git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $di
 #charm pull cs:~openstack-charmers-next/lxd xenial/lxd
 
 # Controller specific charm
-charm pull cs:trusty/apache-kafka $distro/kafka
-bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived
-bzr branch lp:~sdn-charmers/charms/$distro/cassandra/ufw $distro/cassandra
-bzr branch lp:~sdn-charmers/charms/$distro/contrail-analytics/trunk $distro/contrail-analytics
-bzr branch lp:~sdn-charmers/charms/$distro/contrail-configuration/trunk $distro/contrail-configuration
-bzr branch lp:~sdn-charmers/charms/$distro/contrail-control/trunk $distro/contrail-control
-bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail-webui
-charm pull cs:trusty/apache-zookeeper $distro/zookeeper
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk $distro/neutron-api-contrail
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk $distro/neutron-contrail
-bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer-contrail
-bzr branch lp:~sdn-charmers/charms/$distro/ceilometer-contrail/trunk $distro/ceilometer-contrail
+git clone https://git.opnfv.org/ovno.git
+cd ovno/charms/trusty
+mv * ../../../$distro/
+cd ../../../
+rm -rf ovno