Add extra options to apt-get to control conflicts

As there might be a new config files in updated packages,
there is possiblity that apt-get will fail at `upgrade`.

Added 2 apt-get/dpkg options:
    -o Dpkg::Options::="--force-confdef"
    -o Dpkg::Options::="--force-confold"

From now on all conflicts will be resolved with an existing versions
of a config files.

Change-Id: Ia3baf77121aacf416742921fe15bdd8cecc96a31

diff --git a/scripts/mos_apply_mu.py b/scripts/mos_apply_mu.py
index 9472d9890b60ae71431bf35a7f76c5551ebca138..5d2fda2510cc4efde887304365fb6ac9fb90e61c 100644 (file)
--- a/scripts/mos_apply_mu.py
+++ b/scripts/mos_apply_mu.py
@@ -282,7 +282,9 @@ def send_shell_script(ip, os_version):
                     "|| echo -e \"\\ndeb http://{0}:8080/updates/ubuntu "
                     "precise main\" >> /etc/apt/sources.list)\n"
                     "apt-get update\n"
-                    "apt-get upgrade -y\n".format(master_ip),
+                    "apt-get -o Dpkg::Options::=\"--force-confdef\" -o "
+                    "Dpkg::Options::=\"--force-confold\" -y "
+                    "upgrade\n".format(master_ip),
 
         'centos':   "yum-config-manager --add-repo=http://{0}:8080/updates/"
                     "centos/os/x86_64/\nyum update --skip-broken -y "