From b8f055c82d9d2e80e77d96a19068f238fd394424 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 4 Jan 2016 22:11:34 -0600 Subject: modified to support the ha deployment in case of virtual machine. Change-Id: I36969409f87d8bf3a4fabc73b0d5de22e5af9a29 --- ci/onos/juju-deployer/scripts/openstack.sh | 8 -------- 1 file changed, 8 deletions(-) (limited to 'ci/onos/juju-deployer/scripts') diff --git a/ci/onos/juju-deployer/scripts/openstack.sh b/ci/onos/juju-deployer/scripts/openstack.sh index 77f97723..e12ebbfd 100644 --- a/ci/onos/juju-deployer/scripts/openstack.sh +++ b/ci/onos/juju-deployer/scripts/openstack.sh @@ -21,14 +21,6 @@ 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) configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical > cloud/admin-openrc -- cgit 1.2.3-korg