diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | cloudinit/distros/debian.py | 1 | ||||
| -rw-r--r-- | doc/examples/cloud-config.txt | 25 |
3 files changed, 17 insertions, 11 deletions
@@ -52,6 +52,8 @@ (LP: #1023179) - use python-requests rather than urllib2. By using recent versions of python-requests, we get https support (LP: #1067888). + - make apt-get invoke 'dist-upgrade' rather than 'upgrade' for + package_upgrade. (LP: #1164147) 0.7.1: - sysvinit: fix missing dependency in cloud-init job for RHEL 5.6 diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index a1e28ad5..0811eefd 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -161,7 +161,6 @@ class Distro(distros.Distro): elif args and isinstance(args, list): cmd.extend(args) - subcmd = command if command == "upgrade": subcmd = self.get_option("apt_get_upgrade_subcommand", diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index b8abb67a..24b4b36c 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -125,18 +125,23 @@ apt_sources: =Y2oI -----END PGP PUBLIC KEY BLOCK----- -# apt_get_command: [command, argument, argument] -# Specify a different 'apt-get' command. must be a list. subcommands are -# appended to it. default is: -# ['apt-get', '--option=Dpkg::Options::=--force-confold', -# '--option=Dpkg::options::=--force-unsafe-io', '--assume-yes', '--quiet'] +## apt config via system_info: +# under the 'system_info', you can further customize cloud-init's interaction +# with apt. +# system_info: +# apt_get_command: [command, argument, argument] +# apt_get_upgrade_subcommand: dist-upgrade +# +# apt_get_command: +# To specify a different 'apt-get' command, set 'apt_get_command'. +# This must be a list, and the subcommand (update, upgrade) is appended to it. +# default is: +# ['apt-get', '--option=Dpkg::Options::=--force-confold', +# '--option=Dpkg::options::=--force-unsafe-io', '--assume-yes', '--quiet'] # # apt_get_upgrade_subcommand: -# Specify a different 'apt-get upgrade' subcommand. when 'apt_upgrade' or -# package_upgrade is set to true above, then this subcommand will be invoked. -# default is 'dist-upgrade'. For example, you could set this to 'upgrade'. -apt_get_upgrade_subcommand: dist-upgrade - +# Specify a different subcommand for 'upgrade. The default is 'dist-upgrade'. +# This is the subcommand that is invoked if package_upgrade is set to true above. # Install additional packages on first boot # |