From ccae91d723835c188cbef160b1057706dd870ea8 Mon Sep 17 00:00:00 2001 From: Narinder Gupta 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 Change-Id: I81cd7e80667759969fa511a1879b3201ca94c87d Conflicts: ci/odl/juju-deployer/scripts/openstack.sh --- ci/odl/juju-deployer/scripts/openstack.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ci/odl/juju-deployer/scripts') 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 1.2.3-korg