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 2eb8144..2083726 100644 (file)
--- 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