summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-04 22:11:34 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-04 22:12:43 -0600
commitb8f055c82d9d2e80e77d96a19068f238fd394424 (patch)
treeb20e1ed07ce9d05dcfef1281367f79cde4e9e091 /ci/odl
parent9d5ca8b6a6c9e33a5f8318483ad940eb9918819d (diff)
modified to support the ha deployment in case of virtual machine.
Change-Id: I36969409f87d8bf3a4fabc73b0d5de22e5af9a29
Diffstat (limited to 'ci/odl')
-rwxr-xr-xci/odl/01-deploybundle.sh8
-rwxr-xr-xci/odl/juju-deployer/scripts/openstack.sh8
2 files changed, 4 insertions, 12 deletions
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 354082bc..eca968cc 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -75,19 +75,19 @@ echo "... Deployment Started ...."
case "$1" in
'nonha' )
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
;;
'ha' )
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
;;
'tip' )
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
;;
* )
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml trusty-"$2"
+ juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2"
;;
esac
diff --git a/ci/odl/juju-deployer/scripts/openstack.sh b/ci/odl/juju-deployer/scripts/openstack.sh
index 77f97723..e12ebbfd 100755
--- a/ci/odl/juju-deployer/scripts/openstack.sh
+++ b/ci/odl/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