summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-06 22:40:38 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-10-06 22:54:19 -0500
commit1e59c89faec7ff45140227c8db1c00cf63d9b45b (patch)
tree64f97cf71d1c102b7f1d78d9d17c77cabedff8c9 /ci/opencontrail
parent4b367d124bece258eb520c7878de835b37a01abb (diff)
modified to fix the opencontrail bundle issue for nonha.
Change-Id: I3b35c8bb4d9ceecdacebf2b092fe38acb77b5076 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/opencontrail')
-rwxr-xr-xci/opencontrail/fetch-charms.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 53dc7361..3d033958 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -12,7 +12,7 @@ function build {
# openstack
bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
-charm pull cs:$distro/mongodb $distro/mongodb
+charm pull cs:trusty/mongodb $distro/mongodb
charm pull cs:$distro/haproxy $distro/haproxy
charm pull cs:$distro/ntp $distro/ntp
@@ -22,7 +22,7 @@ git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/ch
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.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
@@ -63,15 +63,15 @@ git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $di
#charm pull cs:~openstack-charmers-next/lxd xenial/lxd
# Controller specific charm
-charm pull cs:$distro/apache-kafka $distro/kafka
+charm pull cs:trusty/apache-kafka $distro/kafka
bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived
bzr branch lp:~sdn-charmers/charms/$distro/cassandra/ufw $distro/cassandra
bzr branch lp:~sdn-charmers/charms/$distro/contrail-analytics/trunk $distro/contrail-analytics
bzr branch lp:~sdn-charmers/charms/$distro/contrail-configuration/trunk $distro/contrail-configuration
bzr branch lp:~sdn-charmers/charms/$distro/contrail-control/trunk $distro/contrail-control
bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail-webui
-charm pull cs:$distro/apache-zookeeper $distro/zookeeper
-bzr branch lp:~opnfv-team/charms/$distro/neutron-api-contrail/trunk $distro/neutron-api-contrail
-bzr branch lp:~opnfv-team/charms/$distro/neutron-contrail/trunk $distro/neutron-contrail
-bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer-plugin
+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
bzr branch lp:~sdn-charmers/charms/$distro/ceilometer-contrail/trunk $distro/ceilometer-contrail