From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 24 Mar 2016 18:51:27 +0000 (-0500)
Subject: adding the charm from which haproxy will be deployed
X-Git-Tag: colorado.1.0~219
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=88c125b7fb46f4b47d0fd2cf489234637405db30;p=joid.git

adding the charm from which haproxy will be deployed

Change-Id: I340b92fbe6bdb30cef19520038e5fbb418a3a69f
---

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