From cc77a528367b295b8033f73610143713c18a1bb9 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 4 Apr 2016 15:17:28 -0400 Subject: chef: fix chef installation from gems Installation from gems was previously always broken. This fixes the order or parameters calling install_chef_from_gems. LP: #1553345 --- ChangeLog | 1 + cloudinit/config/cc_chef.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index df3f5f19..3fade4db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ timezone. Change default user to 'freebsd'. [Ben Arblaster] - locale: list unsupported environment settings in warning (LP: #1558069) - disk_setup: correctly send --force to mkfs on block devices (LP: #1548772) + - chef: fix chef install from gems (LP: #1553345) 0.7.6: - open 0.7.6 diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py index e18c5405..28711a59 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -285,7 +285,7 @@ def install_chef(cloud, chef_cfg, log): chef_version = util.get_cfg_option_str(chef_cfg, 'version', None) ruby_version = util.get_cfg_option_str(chef_cfg, 'ruby_version', RUBY_VERSION_DEFAULT) - install_chef_from_gems(cloud.distro, ruby_version, chef_version) + install_chef_from_gems(ruby_version, chef_version, cloud.distro) # Retain backwards compat, by preferring True instead of False # when not provided/overriden... run = util.get_cfg_option_bool(chef_cfg, 'exec', default=True) -- cgit v1.2.3