From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 25 Nov 2015 21:38:03 +0000 (-0600)
Subject: merge erro
X-Git-Tag: brahmaputra.1.0~127
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=001fe1738656aecd1c57790fb29fb36c48147d50;p=joid.git

merge erro

Change-Id: I386b218e768b9c7836d862b1bb2f1b4670bb240f
---

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 2eb81445..20837260 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -85,7 +85,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph:
-      charm: :trusty/ceph
+      charm: cs:trusty/ceph
       num_units: 1
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7