From: vrovachev <vrovachev@mirantis.com>
Date: Fri, 11 Dec 2015 14:50:01 +0000 (+0300)
Subject: Add parameter for disable ubuntu repos
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=18e876dffad5d93b7f022e69756bce58d7d4a2e3;p=tools%2Fsustaining.git

Add parameter for disable ubuntu repos

Added parameter which disables repos in file sources.d
for update and upgrade commants for Ubuntu update.

Change-Id: I00046a9c80c83411cde3c6ee714544b159d6bd21
---

diff --git a/scripts/mos_apply_mu.py b/scripts/mos_apply_mu.py
index b1d8158..91e7989 100755
--- a/scripts/mos_apply_mu.py
+++ b/scripts/mos_apply_mu.py
@@ -66,12 +66,15 @@ class Config(object):
             "master_ip": None,
             "repo_install_text": 'echo "{REPO_TEXT}" > {REPO_FILE};\n',
             "repo_use_text": {
-                'ubuntu':   'apt-get -o Dir::Etc::sourceparts="/root/mos_update_repo/"'
+                'ubuntu':   'apt-get -o Dir::etc::sourcelist="-"'
+                            ' -o Dir::Etc::sourceparts="/root/mos_update_repo/"'
                             ' -o APT::Get::List-Cleanup="0" update\n'
-                            'apt-get -o Dir::Etc::sourceparts="/root/mos_update_repo/"'
+                            'apt-get -o Dir::etc::sourcelist="-"'
+                            ' -o Dir::Etc::sourceparts="/root/mos_update_repo/"'
                             ' -o APT::Get::List-Cleanup="0"'
                             ' -o Dpkg::Options::="--force-confdef"'
-                            ' -o Dpkg::Options::="--force-confold" -y upgrade\n',
+                            ' -o Dpkg::Options::="--force-confold" -y'
+                            ' --force-yes upgrade\n',
                 'centos':   'yum --disablerepo="*" {REPOS_ACTIVATE} update'
                             ' --skip-broken -y --nogpgcheck\n'
             },
@@ -569,12 +572,15 @@ class Updater511(BasicUpdater):
             }
         }
         self.cfg["repo_use_text"] = {
-                'ubuntu':   'apt-get -o Dir::Etc::sourceparts="/root/mos_update_repo/"'
+                'ubuntu':   'apt-get -o Dir::etc::sourcelist="-"'
+                            ' -o Dir::Etc::sourceparts="/root/mos_update_repo/"'
                             ' -o APT::Get::List-Cleanup="0" update\n'
-                            'apt-get -o Dir::Etc::sourceparts="/root/mos_update_repo/"'
+                            'apt-get -o Dir::etc::sourcelist="-"'
+                            ' -o Dir::Etc::sourceparts="/root/mos_update_repo/"'
                             ' -o APT::Get::List-Cleanup="0"'
                             ' -o Dpkg::Options::="--force-confdef"'
-                            ' -o Dpkg::Options::="--force-confold" -y dist-upgrade\n',
+                            ' -o Dpkg::Options::="--force-confold" -y'
+                            ' --force-yes dist-upgrade\n',
                 'centos':   'yum --disablerepo="*" {REPOS_ACTIVATE} update'
                             ' --skip-broken -y --nogpgcheck\n'
         }