summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-06-22 20:30:08 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-06-22 20:30:08 -0700
commit73e59752a8d776b12d03a5e9dd9d5f8b9823f66c (patch)
treee38dae147a6336d4b52a28011659fc2ececa6b42 /cloudinit
parent70e06cd4c9cd0f3fdb1c774191962c5eb7923684 (diff)
downloadvyos-cloud-init-73e59752a8d776b12d03a5e9dd9d5f8b9823f66c.tar.gz
vyos-cloud-init-73e59752a8d776b12d03a5e9dd9d5f8b9823f66c.zip
Disable capturing of these subp calls
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_chef.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index d8bd85f8..d682398a 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -96,7 +96,8 @@ 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', '-d', '-i', '1800', '-s', '20'])
+ 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
cloud.distro.install_packages(('chef',))
@@ -121,8 +122,8 @@ def install_chef_from_gems(ruby_version, chef_version, distro):
if chef_version:
util.subp(['/usr/bin/gem', 'install', 'chef',
'-v %s' % chef_version, '--no-ri',
- '--no-rdoc', '--bindir', '/usr/bin', '-q'])
+ '--no-rdoc', '--bindir', '/usr/bin', '-q'], capture=False)
else:
util.subp(['/usr/bin/gem', 'install', 'chef',
'--no-ri', '--no-rdoc', '--bindir',
- '/usr/bin', '-q'])
+ '/usr/bin', '-q'], capture=False)