From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 29 Jan 2016 18:36:14 +0000 (-0600)
Subject: trying upgrade again.
X-Git-Tag: brahmaputra.1.0~30
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d1d273b670f7b32ddc26b3446f413f8fe705ece7;p=joid.git

trying upgrade again.

Change-Id: I796be316260aba3b8bedd5b28827dc4f5ffa3339
(cherry picked from commit cf7feaa77eda9327bfa7ba40b50abe25eaaf73e5)
---

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index c8682861..08de4dce 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -73,7 +73,7 @@ sudo apt-add-repository ppa:juju/stable -y
 sudo apt-add-repository ppa:maas/stable -y
 sudo apt-add-repository cloud-archive:liberty -y
 sudo apt-get update -y
-sudo apt-get dist-upgrade -y -y || true
+sudo apt-get -o Dpkg::Options::='--force-confold' --force-yes -fuy dist-upgrade
 sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient
 
 sudo pip install shyaml