diff options
| author | Avishai Ish-Shalom <avishai.ish-shalom@mail.huji.ac.il> | 2011-09-08 12:43:20 +0300 |
|---|---|---|
| committer | Avishai Ish-Shalom <avishai.ish-shalom@mail.huji.ac.il> | 2011-09-08 12:43:20 +0300 |
| commit | 0921f665ed0085ead8e3335acd79c7eadf761363 (patch) | |
| tree | 9c9c66a7679b91edc36c8f0e4133e10f7d8bce13 | |
| parent | a541b34fcddc101ba1c5128dc577482188f0760b (diff) | |
| download | vyos-cloud-init-0921f665ed0085ead8e3335acd79c7eadf761363.tar.gz vyos-cloud-init-0921f665ed0085ead8e3335acd79c7eadf761363.zip | |
Fixed review rejects: firstboot.json write, gem_binary not defined, wrong validation cert name
| -rw-r--r-- | cloudinit/CloudConfig/cc_chef.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cloudinit/CloudConfig/cc_chef.py b/cloudinit/CloudConfig/cc_chef.py index 63e3808a..10f3a67a 100644 --- a/cloudinit/CloudConfig/cc_chef.py +++ b/cloudinit/CloudConfig/cc_chef.py @@ -46,7 +46,7 @@ def handle(name,cfg,cloud,log,args): # set the validation cert if chef_cfg.has_key('validation_cert'): - with open('/etc/chef/validation.cert', 'w') as validation_cert_fh: + with open('/etc/chef/validation.pem', 'w') as validation_cert_fh: validation_cert_fh.write(chef_cfg['validation_cert']) # create the chef config from template @@ -56,7 +56,7 @@ def handle(name,cfg,cloud,log,args): chef_args = ['-d'] # set the firstboot json if chef_cfg.has_key('run_list'): - with open('/etc/chef/firstboot.json') as firstboot_json_fh: + with open('/etc/chef/firstboot.json', 'w') as firstboot_json_fh: firstboot_json_fh.write("{\n\"run_list\":\n[\n") for runlist_item in chef_cfg['run_list']: firstboot_json_fh.write(runlist_item + "\n") @@ -68,6 +68,8 @@ def handle(name,cfg,cloud,log,args): def install_chef_from_gems(ruby_version, chef_version = None): cc.install_packages(ruby_packages[ruby_version]) + gem_bin = get_gem_bin() + if not os.path.exists('/usr/bin/gem'): os.symlink(gem_bin, '/usr/bin/gem') chef_version_arg = "" if chef_version: chef_version_arg = "-v %s" % chef_version subprocess.check_call([gem_bin,'install','chef',chef_version_arg, '--no-ri','--no-rdoc','--no-test','-q']) @@ -78,3 +80,6 @@ def install_chef_from_gems(ruby_version, chef_version = None): except: pass try: os.symlink('/usr/bin/ruby%s' % ruby_version, '/usr/bin/ruby') except: pass + +def get_gem_bin(): + return '/usr/bin/gem%s' % util.get_cfg_option_str(chef_cfg, 'ruby_version', '1.8') |