summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_chef.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-09-02 12:18:21 -0400
committerScott Moser <smoser@ubuntu.com>2014-09-02 12:18:21 -0400
commitcc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b (patch)
treee9bdcbc699eda6db5e57d35b25d222bead96da12 /cloudinit/config/cc_chef.py
parentfbfd3789ede42ad50e0b79f202ab18b65537af52 (diff)
parente39abc783f7edd6435dbc7ea1fc3d02e6b3955d3 (diff)
downloadvyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.tar.gz
vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.zip
merge from trunk
Diffstat (limited to 'cloudinit/config/cc_chef.py')
-rw-r--r--cloudinit/config/cc_chef.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index 727769cd..806deed9 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -87,7 +87,8 @@ def handle(name, cfg, cloud, log, _args):
# If chef is not installed, we install chef based on 'install_type'
if (not os.path.isfile('/usr/bin/chef-client') or
- util.get_cfg_option_bool(chef_cfg, 'force_install', default=False)):
+ util.get_cfg_option_bool(chef_cfg,
+ 'force_install', default=False)):
install_type = util.get_cfg_option_str(chef_cfg, 'install_type',
'packages')