1 files changed, 26 insertions, 13 deletions
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 3cf269c2..035a965d 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -1,19 +1,32 @@
 #!/bin/sh -ex
 
-mkdir -p src/charms/trusty
+distro=$distro
+mkdir -p $distro
 
 # 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:~sdn-charmers/charms/trusty/neutron-api/odl src/charms/trusty/neutron-api-odl
-bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next
-bzr branch lp:~sdn-charmers/charms/trusty/nova-compute/odl src/charms/trusty/nova-compute-odl
-bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next
-bzr branch lp:~sdn-charmers/charms/trusty/quantum-gateway/odl src/charms/trusty/quantum-gateway-odl
+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
 
-# opendaylight
-bzr branch lp:~sdn-charmers/charms/trusty/odl-controller/trunk src/charms/trusty/odl-controller
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-odl/trunk src/charms/trusty/neutron-odl
+#controller specific charm
+bzr branch lp:~openstack-charmers/charms/$distro/odl-controller/next $distro/odl-controller
+bzr branch lp:~openstack-charmers/charms/$distro/neutron-api-odl/next $distro/neutron-api-odl
+bzr branch lp:~openstack-charmers/charms/$distro/openvswitch-odl/trunk $distro/openvswitch-odl
 
-mkdir -p charms/trusty
-(cd charms/trusty; ln -s ../../src/charms/trusty/* .)