summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-22 23:14:21 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-22 23:14:21 +0000
commitf5fe97c47db6dc4cb860938cd5c083eb351b0460 (patch)
tree1590cc55a2f3e9164b20dc035dd3e0b2393aea5c /ci
parente12388d890501d66654bb0c190b138a84cb097bc (diff)
parent85f9f592304d0608944ba21336dd35b7e880dce8 (diff)
Merge "added the more resiliency towards created pool."
Diffstat (limited to 'ci')
-rwxr-xr-xci/02-maasdeploy.sh17
1 files changed, 8 insertions, 9 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 72c2c615..e0e3ca89 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -56,15 +56,14 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then
ssh-keygen -N '' -f $HOME/.ssh/id_rsa
fi
-if [ ! -e /var/lib/libvirt/images ]; then
-
- sudo apt-get install libvirt-bin -y
- sudo adduser $USER libvirtd
- sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/
- sudo virsh pool-start default
- sudo virsh pool-autostart default
-
-fi
+#define the pool and try to start even though its already exist.
+# For fresh install this may or may not there.
+
+sudo apt-get install libvirt-bin -y
+sudo adduser $USER libvirtd
+sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ || true
+sudo virsh pool-start default || true
+sudo virsh pool-autostart default || true
sudo apt-add-repository ppa:maas-deployers/stable -y
sudo apt-add-repository ppa:juju/stable -y