cloud-init-dev team mailing list archive

[TooAngel <tooangel@xxxxxxxxxxx>]

TooAngel has proposed merging lp:~tooangel/cloud-init/chefgem into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1447252 in cloud-init: "chef installation as gem"
  https://bugs.launchpad.net/cloud-init/+bug/1447252

For more details, see:
https://code.launchpad.net/~tooangel/cloud-init/chefgem/+merge/258609
-- 
Your team cloud init development team is requested to review the proposed merge of lp:~tooangel/cloud-init/chefgem into lp:cloud-init.

=== modified file 'cloudinit/config/cc_chef.py'
--- cloudinit/config/cc_chef.py	2015-01-27 19:24:22 +0000
+++ cloudinit/config/cc_chef.py	2015-05-08 11:16:16 +0000
@@ -285,7 +285,7 @@
         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)