diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-06-22 23:26:50 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-06-22 23:26:50 -0700 |
| commit | f8413af9168adc0ad7c730b9adea9eba67949ba5 (patch) | |
| tree | 03b9896cb71a24839e12eb6db4dbd5a640f21b4a /cloudinit/config/cc_chef.py | |
| parent | 9d1f042f862c114f1613dcd5d2d8c401a1c54eaa (diff) | |
| download | vyos-cloud-init-f8413af9168adc0ad7c730b9adea9eba67949ba5.tar.gz vyos-cloud-init-f8413af9168adc0ad7c730b9adea9eba67949ba5.zip | |
1. Move the getkeybyid function back here but add some slight adjustments
a. Instead of executing a bash string, write out a temporary file
and then just execute '/bin/sh' on that file with the right arguments instead.
2. Rename util.SilentTemporaryFile to util.ExtendedTemporaryFile and update the usages
of the previous name accordingly, this better reflects what this temp file is.
3. More teenie pep8 line length fixings
Diffstat (limited to 'cloudinit/config/cc_chef.py')
| -rw-r--r-- | cloudinit/config/cc_chef.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py index d682398a..6f568261 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -96,7 +96,7 @@ def handle(name, cfg, cloud, log, _args): install_chef_from_gems(cloud.distro, ruby_version, chef_version) # and finally, run chef-client log.debug('Running chef-client') - util.subp(['/usr/bin/chef-client', + util.subp(['/usr/bin/chef-client', '-d', '-i', '1800', '-s', '20'], capture=False) elif install_type == 'packages': # this will install and run the chef-client from packages |