X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopencontrail%2Ffetch-charms.sh;h=908f7c114e11ca801bb7a07b58d1ea13ea69fbc6;hb=d1aaa3704c4bb65a5f45ccfc1cb5d8bf18e6fb32;hp=1b8fa95518f2e4aa80c95679d07560d06800e483;hpb=40852ce534510baa48038615158ecf3bb89e922d;p=joid.git

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 1b8fa955..908f7c11 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -12,19 +12,19 @@ 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
+charm pull cs:trusty/mongodb $distro/mongodb
+charm pull cs:$distro/haproxy $distro/haproxy
+charm pull cs:$distro/ntp $distro/ntp
+charm pull cs:$distro/aodh $distro/aodh
 
 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-aodh.git $distro/charm-aodh
-build aodh
 
 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
-git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph-mon
-#git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+#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
 git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
@@ -33,12 +33,13 @@ git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/
 git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
 git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
 git clone -b stable/16.07 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+#git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
 git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
 git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
 git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
 
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
 #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
@@ -62,13 +63,8 @@ git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/he
 #charm pull cs:~openstack-charmers-next/lxd xenial/lxd
 
 # Controller specific charm
-bzr branch lp:~sdn-charmers/charms/trusty/keepalived/trunk $distro/keepalived
-bzr branch lp:~stub/charms/trusty/cassandra/noauthentication $distro/cassandra
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk $distro/contrail-analytics
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk $distro/contrail-configuration
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-control/trunk $distro/contrail-control
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-webui/trunk $distro/contrail-webui
-bzr branch lp:~charmers/charms/precise/zookeeper/trunk precise/zookeeper
-bzr branch lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk $distro/neutron-api-contrail
-bzr branch lp:~opnfv-team/charms/trusty/neutron-contrail/trunk $distro/neutron-contrail
-bzr branch lp:~opnfv-team/charms/trusty/neutron-api/next $distro/neutron-api
+git clone https://git.opnfv.org/ovno.git
+cd ovno/charms/trusty
+mv * ../../../$distro/
+cd ../../../
+rm -rf ovno