From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Sat, 1 Oct 2016 01:43:58 +0000 (-0500)
Subject: added few more proxy, ntp and promise charm.
X-Git-Tag: danube.1.0~147
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F22625%2F1;p=joid.git

added few more proxy, ntp and promise charm.

Change-Id: Ic5dffddb289775b5f2a2cc332e38c9e2af86fe5b
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 1a86e08c..53dc7361 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -11,11 +11,10 @@ function build {
 }
 
 # openstack
-#bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
-#bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
+bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 charm pull cs:$distro/mongodb $distro/mongodb
-#charm pull cs:~free.ekanayaka/xenial/haproxy xenial/haproxy
-charm pull cs:$distro/haproxy
+charm pull cs:$distro/haproxy $distro/haproxy
+charm pull cs:$distro/ntp $distro/ntp
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress
@@ -66,13 +65,11 @@ git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $di
 # Controller specific charm
 charm pull cs:$distro/apache-kafka $distro/kafka
 bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived
-#bzr branch lp:~stub/charms/trusty/cassandra/noauthentication $distro/cassandra
 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
-#bzr branch lp:~charmers/charms/precise/zookeeper/trunk precise/zookeeper
 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