summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-03-24 13:51:27 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-03-24 13:51:27 -0500
commit88c125b7fb46f4b47d0fd2cf489234637405db30 (patch)
treebd35067c9c69b53e86b616323a0ac3dc8c5aeaa9 /ci
parent233e251b4d192236224b612d96e1a2aa4696b5f5 (diff)
adding the charm from which haproxy will be deployed
Change-Id: I340b92fbe6bdb30cef19520038e5fbb418a3a69f
Diffstat (limited to 'ci')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index d945fdd7..df1ca889 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -256,6 +256,7 @@ openstack-phase2:
openvswitch-odl:
branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
haproxy:
+ charm: cs:trusty/haproxy
options:
services: |
- service_name: nova