summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-02-17 17:51:37 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-17 17:51:37 +0000
commit0155ab3e7de7f8f6571b5e0a31e969797f5ad8a5 (patch)
treec51da624f3f0b59cffe74f753f6ae3652a997b24 /ci
parent0ac2b2f67d46cf5aadf6779eec85cdecce618fd7 (diff)
parent250d86174009390c635974db82c47f7bf471164a (diff)
Merge "The haproxy charm update for the OpenContrail HA bundle."
Diffstat (limited to 'ci')
-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