Project

General

Profile

Actions

Bug #13868

closed

Bug #13679: On rudder-webapp upgrade, ncf.conf file is not commited

Add check of ncf.conf file existence before adding it

Added by Vincent MEMBRÉ about 6 years ago. Updated almost 6 years ago.

Status:
Released
Priority:
N/A
Category:
Packaging
Target version:
Severity:
UX impact:
User visibility:
Effort required:
Priority:
0
Name check:
Fix check:
Regression:

Description

If we update ncf.conf file during upgrade that file is not commited, which may break techniques upgrades

root@server:~# rudder server upgrade-techniques -u
error: Your local changes to the following files would be overwritten by checkout:
    ncf/ncf.conf
Please, commit your changes or stash them before you can switch branches.
Aborting
You have unstagged changes in current branch
Aborting

here is the diff after upgrading from 4.1.15 to 4.3.5

root@server:/var/rudder/configuration-repository# git diff
diff --git a/ncf/ncf.conf b/ncf/ncf.conf
index 813a71d..acae82c 100644
--- a/ncf/ncf.conf
+++ b/ncf/ncf.conf
@@ -11,7 +11,7 @@
 #
 {{#classes.any}}
 # Which logger(s) should be used in ncf? (comma separated list)
-loggers=_log_default,log_rudder
+loggers=log_rudder
 # Which abort handler(s) should be used in ncf? (comma separated list)
 abort_handlers=_abort_default,abort_rudder
 {{/classes.any}}

Actions

Also available in: Atom PDF