summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-07 00:03:20 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-10-07 08:18:23 -0500
commit18edc25759537951d6c5cdc3575c3d1b5c0d9fbc (patch)
tree2bc22dd634ce127c8ac9b7094458e8c0598d7a1c /ci/opencontrail
parent44db065d7944b02b6948fbda4e504d6e9df0f640 (diff)
fetch the correct ceilometer.
Change-Id: I68bd8c58cd9424886086275664dc70110270252a Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/opencontrail')
-rwxr-xr-xci/opencontrail/fetch-charms.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 55500949..402132c6 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -21,7 +21,8 @@ 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
+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
@@ -72,5 +73,4 @@ bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail
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