summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-04-04 15:17:28 -0400
committerScott Moser <smoser@ubuntu.com>2016-04-04 15:17:28 -0400
commitcc77a528367b295b8033f73610143713c18a1bb9 (patch)
tree36e6aaf85ca929cc7202049b6c92a15a5f375acc /cloudinit
parent3de63003f63801a046b2526b264caa92371d8e9f (diff)
downloadvyos-cloud-init-cc77a528367b295b8033f73610143713c18a1bb9.tar.gz
vyos-cloud-init-cc77a528367b295b8033f73610143713c18a1bb9.zip
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
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_chef.py2
1 files changed, 1 insertions, 1 deletions
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)