summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail
diff options
context:
space:
mode:
authorSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>2016-02-12 16:15:30 -0800
committerSamantha Jian-Pielak <samantha.jian-pielak@canonical.com>2016-02-12 16:16:25 -0800
commit250d86174009390c635974db82c47f7bf471164a (patch)
treede8eae17aa867f8f8da9a7f5b1b58096a4f91ad2 /ci/opencontrail
parent3d836087874a45b29cce1d45de32bf7eef02da90 (diff)
The haproxy charm update for the OpenContrail HA bundle.
Change-Id: I52c22180467df0506bdb9b4c074b67b494be1bf9
Diffstat (limited to 'ci/opencontrail')
-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