Skip to content

Commit af2785a

Browse files
author
Gabriel Monroy
committed
remove knife template for etcd gem at load-time
1 parent 405245b commit af2785a

2 files changed

Lines changed: 0 additions & 58 deletions

File tree

cm/chef.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,6 @@
4949
_valid_pem_path = os.path.join(CHEF_CONFIG_PATH, 'validation.pem')
5050
CHEF_VALIDATION_KEY = subprocess.check_output(
5151
['/bin/cat', _valid_pem_path]).strip('\n')
52-
# write out knife template
53-
if not os.path.exists('.chef'):
54-
os.mkdir('.chef')
55-
_template_src = os.path.abspath(os.path.join(__file__, '..', 'ubuntu12.04-gems.erb'))
56-
with open(_template_src) as src:
57-
_knife_template = os.path.abspath(os.path.join('.chef', 'knife-template.erb'))
58-
with open(_knife_template, 'w') as f:
59-
f.write(src.read())
6052
except Exception as err:
6153
msg = "Failed to auto-configure Chef -- {}".format(err)
6254
if os.environ.get('READTHEDOCS'):
@@ -99,7 +91,6 @@ def bootstrap_node(node):
9991
# build knife bootstrap command
10092
args = ['knife', 'bootstrap', node['fqdn']]
10193
args.extend(['--config', '/etc/chef/client.rb'])
102-
args.extend(['--template-file', '.chef/knife-template.erb'])
10394
args.extend(['--identity-file', pk_path])
10495
args.extend(['--node-name', node['id']])
10596
args.extend(['--sudo', '--ssh-user', node['ssh_username']])

cm/ubuntu12.04-gems.erb

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)