From ccae91d723835c188cbef160b1057706dd870ea8 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 25 Nov 2015 15:35:22 -0600
Subject: modified the bundle to include the ceph and cinder changes. added
ceph to use the single size of minimum.
Author: Narinder Gupta <narinder.gupta@canonical.com>
Change-Id: I81cd7e80667759969fa511a1879b3201ca94c87d
Conflicts:
ci/odl/juju-deployer/scripts/openstack.sh
---
ci/odl/juju-deployer/ovs-odl-ha.yaml | 12 +++++++-----
ci/odl/juju-deployer/scripts/openstack.sh | 5 +++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index b4811ec1..2eb81445 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: cs:trusty/ceph
+ charm: :trusty/ceph
num_units: 1
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -115,20 +115,20 @@ openstack-phase2:
# - "lxc:nodes-api=0"
cinder:
charm: cs:trusty/cinder
- num_units: 1
+ num_units: 3
options:
block-device: None
glance-api-version: 2
# ha-mcastport: 5401
to:
- "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
cinder-ceph:
charm: cs:trusty/cinder-ceph
"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"
@@ -214,7 +214,6 @@ 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:
@@ -339,6 +338,7 @@ trusty-liberty:
source: "cloud:trusty-liberty"
"openstack-origin": "cloud:trusty-liberty"
series: trusty
+ ceph-osd-replication-count: 1
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -354,6 +354,7 @@ trusty-kilo:
source: "cloud:trusty-kilo"
"openstack-origin": "cloud:trusty-kilo"
series: trusty
+ ceph-osd-replication-count: 1
trusty-juno-nodes:
@@ -370,5 +371,6 @@ trusty-juno:
source: "cloud:trusty-juno"
"openstack-origin": "cloud:trusty-juno"
series: trusty
+ ceph-osd-replication-count: 1
diff --git a/ci/odl/juju-deployer/scripts/openstack.sh b/ci/odl/juju-deployer/scripts/openstack.sh
index 93daa908..77f97723 100755
--- a/ci/odl/juju-deployer/scripts/openstack.sh
+++ b/ci/odl/juju-deployer/scripts/openstack.sh
@@ -21,8 +21,13 @@ unitMachine()
juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
}
+<<<<<<< HEAD
juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
+=======
+#juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
+#juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
+>>>>>>> 69227d1... modified the bundle to include the ceph and cinder changes.
mkdir -m 0700 -p cloud
controller_address=$(unitAddress keystone 0)
--
cgit