From 095dc54cfa61572518b1cbcb5a392467883bdcc0 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sat, 19 Dec 2015 10:50:10 -0600 Subject: modified the bundle for no SDN feature and releasing it for production version only. Change-Id: If8253fdca06de1bdfaa8faa51e52e4f489460828 --- ci/nosdn/juju-deployer/scripts/openstack.sh | 5 ----- 1 file changed, 5 deletions(-) (limited to 'ci/nosdn/juju-deployer/scripts') 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) -- cgit 1.2.3-korg