summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>2016-02-12 16:15:30 -0800
committerNarinder Gupta <narinder.gupta@canonical.com>2016-02-18 00:07:31 +0000
commitf3f382bce61dfb16a280e94efb2b0d59c3784cd9 (patch)
treec43652868648f2896a6b496a93ec1638a89f1ba4
parentcdd37c533579140ac4d713efb1ba250e7711f2d3 (diff)
The haproxy charm update for the OpenContrail HA bundle.
Change-Id: I52c22180467df0506bdb9b4c074b67b494be1bf9 (cherry picked from commit 250d86174009390c635974db82c47f7bf471164a)
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml2
1 files changed, 1 insertions, 1 deletions
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