Never change conf during package update
* All configuration files must be controlled only by salt
Change-Id: Ibfa752c915782250aab385dd8aa93023b3b67c7d
Closes-bug: PROD-25691 (PROD:25691)
diff --git a/cloud-update.groovy b/cloud-update.groovy
index 92701bd..3fd7723 100644
--- a/cloud-update.groovy
+++ b/cloud-update.groovy
@@ -168,9 +168,9 @@
}
def osRelease = salt.getGrain(pepperEnv, target, 'lsb_distrib_codename')
if (osRelease.toString().toLowerCase().contains('trusty')) {
- args = 'export DEBIAN_FRONTEND=noninteractive; apt-get -y -q --force-yes -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" '
+ args = 'export DEBIAN_FRONTEND=noninteractive; apt-get -y -q --force-yes -o Dpkg::Options::=\"--force-confold\" '
} else {
- args = 'export DEBIAN_FRONTEND=noninteractive; apt-get -y -q -f --allow-downgrades -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" '
+ args = 'export DEBIAN_FRONTEND=noninteractive; apt-get -y -q -f --allow-downgrades -o Dpkg::Options::=\"--force-confold\" '
}
if (out.toString().contains('errors:')) {
try {
@@ -278,7 +278,7 @@
}
stage('Apply package downgrades') {
- args = 'export DEBIAN_FRONTEND=noninteractive; apt-get -y -q --allow-downgrades -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" '
+ args = 'export DEBIAN_FRONTEND=noninteractive; apt-get -y -q --allow-downgrades -o Dpkg::Options::=\"--force-confold\" '
common.infoMsg('Performing pkgs purge/remove ... ')
try {
if (PURGE_PKGS != "") {