From: Samantha Jian-Pielak <samantha.jian-pielak@canonical.com>
Date: Sat, 13 Feb 2016 00:15:30 +0000 (-0800)
Subject: The haproxy charm update for the OpenContrail HA bundle.
X-Git-Tag: brahmaputra.1.0~9
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F10173%2F1;p=joid.git

The haproxy charm update for the OpenContrail HA bundle.

Change-Id: I52c22180467df0506bdb9b4c074b67b494be1bf9
(cherry picked from commit 250d86174009390c635974db82c47f7bf471164a)
---

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index dd86cab0..e09a1d7f 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -310,7 +310,7 @@ contrail:
     neutron-contrail:
       branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk
     haproxy:
-      charm: cs:trusty/haproxy
+      branch: lp:~opnfv-team/charms/trusty/haproxy/trunk
       num_units: 2
       options:
         peering_mode: active-active