X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fnosdn%2Ffetch-charms.sh;h=27558a323ad2cee243a59039078972f8f56f967f;hb=6d508d3203fe4a914db1b8cc65f7e2358b1f4766;hp=0a659af0ad6bbaf07367842af4c7950dbe1abcd6;hpb=a909a1d044996db88a9efb9902f83d618e749f2d;p=joid.git

diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 0a659af0..27558a32 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -4,7 +4,7 @@ distro=$1
 mkdir -p $distro
 
 function build {
-    sudo apt-get install charm-tools
+    sudo apt-get install charm-tools -y
     (cd $distro/charm-congress; charm build -s $distro  -obuild src)
     mv $distro/charm-congress/build/$distro/congress $distro
 }
@@ -16,21 +16,21 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $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.git $distro/ceph
+git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
 git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 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
-#git clone https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone -b bug/congress-fix https://github.com/gnuoy/charm-keystone.git $distro/keystone
-git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/16.04 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
 git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
 git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
 git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
 git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
 git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
 git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+#charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server
 git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone https://github.com/openstack/charm-heat.git $distro/heat
 git clone https://github.com/openstack/charm-lxd.git xenial/lxd