From: Thierry Parmentelat Date: Fri, 13 Nov 2015 11:48:16 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodeupdate X-Git-Tag: nodeupdate-0.5-12~1 X-Git-Url: http://git.onelab.eu/?p=nodeupdate.git;a=commitdiff_plain;h=bc6f2dbf35f538ece5a5c0b0ca5206b2e39916cd;hp=ea140475f8622384d00e08f3782f266fed7036f6 Merge branch 'master' of ssh://git.onelab.eu/git/nodeupdate * 'master' of ssh://git.onelab.eu/git/nodeupdate: Setting tag nodeupdate-0.5-11 reflect a name change for NodeManager that becomes nodemanager as part of crucial packages --- diff --git a/NodeUpdate.py b/NodeUpdate.py index 9962ec4..8d07729 100755 --- a/NodeUpdate.py +++ b/NodeUpdate.py @@ -52,7 +52,7 @@ DELETE_RPM_LIST_FILE= '/etc/planetlab/delete-rpm-list' # so, we force the update of crucial pkgs independently, as # the whole group is sometimes too much to swallow # this one is builtin -CRUCIAL_PACKAGES_BUILTIN=[ 'NodeUpdate' , 'nodemanager' ] +CRUCIAL_PACKAGES_BUILTIN=[ 'NodeUpdate' , 'nodemanager-lib', 'nodemanager-lxc', 'nodemanager-vs' ] # and operations can also try to push a list through a conf_file # should use the second one for consistency, try the first one as well for legacy CRUCIAL_PACKAGES_OPTIONAL_PATHS=[