1 files changed, 28 insertions, 13 deletions
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index c5e2e2b8..f352b6cf 100644
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -1,17 +1,32 @@
 #!/bin/sh -ex
 
-mkdir -p src/charms/trusty
-# onos
-bzr branch lp:~wuwenbin2/onosfw/onos-controller src/charms/trusty/onos-controller
-bzr branch lp:~wuwenbin2/onosfw/neutron-gateway src/charms/trusty/neutron-gateway
-bzr branch lp:~wuwenbin2/onosfw/neutron-api-onos src/charms/trusty/neutron-api-onos
-bzr branch lp:~wuwenbin2/onosfw/openvswitch-onos src/charms/trusty/openvswitch-onos
-# openstack
-bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next
-bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next
-bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next
-bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next
+distro=trusty
+mkdir -p $distro
 
+# openstack
+bzr branch lp:~openstack-charmers/charms/$distro/ceilometer/next $distro/ceilometer
+bzr branch lp:~openstack-charmers/charms/$distro/ceilometer-agent/next $distro/ceilometer-agent
+bzr branch lp:~openstack-charmers/charms/$distro/ceph/next $distro/ceph
+bzr branch lp:~openstack-charmers/charms/$distro/ceph-osd/next $distro/ceph-osd
+bzr branch lp:~openstack-charmers/charms/$distro/ceph-radosgw/next $distro/ceph-radosgw
+bzr branch lp:~openstack-charmers/charms/$distro/cinder/next $distro/cinder
+bzr branch lp:~openstack-charmers/charms/$distro/cinder-ceph/next $distro/cinder-ceph
+bzr branch lp:~openstack-charmers/charms/$distro/glance/next $distro/glance
+bzr branch lp:~narindergupta/charms/$distro/promise/trunk $distro/promise
+bzr branch lp:~openstack-charmers/charms/$distro/keystone/next $distro/keystone
+bzr branch lp:~openstack-charmers/charms/$distro/percona-cluster/next $distro/percona-cluster
+bzr branch lp:~openstack-charmers/charms/$distro/neutron-api/next $distro/neutron-api
+bzr branch lp:~openstack-charmers/charms/$distro/neutron-gateway/next $distro/neutron-gateway
+bzr branch lp:~openstack-charmers/charms/$distro/neutron-openvswitch/next $distro/neutron-openvswitch
+bzr branch lp:~openstack-charmers/charms/$distro/nova-cloud-controller/next $distro/nova-cloud-controller
+bzr branch lp:~openstack-charmers/charms/$distro/nova-compute/next $distro/nova-compute
+bzr branch lp:~openstack-charmers/charms/$distro/openstack-dashboard/next $distro/openstack-dashboard
+bzr branch lp:~openstack-charmers/charms/$distro/rabbitmq-server/next $distro/rabbitmq-server
+bzr branch lp:~openstack-charmers/charms/$distro/hacluster/next $distro/hacluster
+bzr branch lp:~openstack-charmers/charms/$distro/heat/next $distro/heat
 
-mkdir -p charms/trusty
-(cd charms/trusty; ln -s ../../src/charms/trusty/* .)
+# Controller specific charm
+bzr branch lp:~wuwenbin2/onosfw/onos-controller $distro/onos-controller
+bzr branch lp:~wuwenbin2/onosfw/neutron-gateway $distro/neutron-gateway
+bzr branch lp:~wuwenbin2/onosfw/neutron-api-onos $distro/neutron-api-onos
+bzr branch lp:~wuwenbin2/onosfw/openvswitch-onos $distro/openvswitch-onos