diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-25 15:35:22 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-25 15:35:22 -0600 |
commit | ccae91d723835c188cbef160b1057706dd870ea8 (patch) | |
tree | 12aabe90023fa53daa75c5c884bec418df5fc9bd /ci/odl/juju-deployer/scripts | |
parent | fbb631733aec9f7d7e9e125a5a3978e1defa370d (diff) |
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
Diffstat (limited to 'ci/odl/juju-deployer/scripts')
-rwxr-xr-x | ci/odl/juju-deployer/scripts/openstack.sh | 5 |
1 files changed, 5 insertions, 0 deletions
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) |