summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-11-24 07:06:56 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-11-24 07:07:40 -0600
commit2ac508a0f3fb99e6af8474603b75da9f54576b06 (patch)
tree4c06173f323ec6c08e2f2805bf4812269e5e0fbd /ci
parentbe7312f3b66e10f754a56e63e5834d3d599d871d (diff)
modified to enable ceph and fix ceph issues with single ceph
module. Change-Id: Idcc7c8da18ec77a2cad3012a14e0f12983b30c4d
Diffstat (limited to 'ci')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 30b3757d..ae333d27 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -118,8 +118,8 @@ openstack-phase2:
num_units: 1
options:
block-device: None
-# glance-api-version: 2
-# ha-mcastport: 5401
+ glance-api-version: 2
+ ha-mcastport: 5401
to:
- "lxc:nodes-api=0"
cinder-ceph:
@@ -127,6 +127,8 @@ openstack-phase2:
"rabbitmq-server":
branch: lp:charms/trusty/rabbitmq-server
num_units: 3
+ options:
+ ceph-osd-replication-count: 1
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
@@ -135,6 +137,7 @@ openstack-phase2:
branch: lp:charms/trusty/keystone
num_units: 3
options:
+ ha-mcastport: 5402
"admin-password": openstack
"admin-token": admin
vip: 10.4.1.13
@@ -211,7 +214,9 @@ openstack-phase2:
branch: lp:charms/trusty/glance
num_units: 3
options:
+ ceph-osd-replication-count: 1
vip: 10.4.1.12
+ ha-mcastport: 5402
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"