summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-11-25 15:38:03 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-11-25 15:38:03 -0600
commit001fe1738656aecd1c57790fb29fb36c48147d50 (patch)
treea5b78ffb88922e7849a27e4d634c0501be329e15 /ci
parentccae91d723835c188cbef160b1057706dd870ea8 (diff)
merge erro
Change-Id: I386b218e768b9c7836d862b1bb2f1b4670bb240f
Diffstat (limited to 'ci')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml2
1 files changed, 1 insertions, 1 deletions
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