diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-04-04 15:17:28 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-04-04 15:17:28 -0400 |
| commit | cc77a528367b295b8033f73610143713c18a1bb9 (patch) | |
| tree | 36e6aaf85ca929cc7202049b6c92a15a5f375acc | |
| parent | 3de63003f63801a046b2526b264caa92371d8e9f (diff) | |
| download | vyos-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
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/config/cc_chef.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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) |