summaryrefslogtreecommitdiffstats
path: root/ci/onos
diff options
context:
space:
mode:
Diffstat (limited to 'ci/onos')
-rw-r--r--ci/onos/01-deploybundle.sh8
-rw-r--r--ci/onos/juju-deployer/scripts/openstack.sh8
2 files changed, 4 insertions, 12 deletions
diff --git a/ci/onos/01-deploybundle.sh b/ci/onos/01-deploybundle.sh
index 118bd2ef..bf7309d6 100644
--- a/ci/onos/01-deploybundle.sh
+++ b/ci/onos/01-deploybundle.sh
@@ -81,19 +81,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/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