diff options
Diffstat (limited to 'ci/nosdn/juju-deployer/scripts')
| -rwxr-xr-x | ci/nosdn/juju-deployer/scripts/openstack.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ci/nosdn/juju-deployer/scripts/openstack.sh b/ci/nosdn/juju-deployer/scripts/openstack.sh index 77f97723..562df8e9 100755 --- a/ci/nosdn/juju-deployer/scripts/openstack.sh +++ b/ci/nosdn/juju-deployer/scripts/openstack.sh @@ -21,13 +21,8 @@ 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) |