summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-01-29 13:08:12 -0500
committerScott Moser <smoser@ubuntu.com>2010-01-29 13:08:12 -0500
commit0f2d829a2709d049f5606cf89e5c70559024853e (patch)
tree37ec2930631776cea59dfdd9463aa1609905dfb6
parentfddec92b8ea39515ff19be1117fcacb32944ab72 (diff)
downloadvyos-cloud-init-0f2d829a2709d049f5606cf89e5c70559024853e.tar.gz
vyos-cloud-init-0f2d829a2709d049f5606cf89e5c70559024853e.zip
move etc/ec2-init/templates to etc/cloud/templates
-rw-r--r--ec2init/util.py2
-rwxr-xr-xsetup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ec2init/util.py b/ec2init/util.py
index 30ce1d82..9b9f6f4d 100644
--- a/ec2init/util.py
+++ b/ec2init/util.py
@@ -72,7 +72,7 @@ def subp(args, input=None):
return(out,err)
def render_to_file(template, outfile, searchList):
- t = Template(file='/etc/ec2-init/templates/%s.tmpl' % template, searchList=[searchList])
+ t = Template(file='/etc/cloud/templates/%s.tmpl' % template, searchList=[searchList])
f = open(outfile, 'w')
f.write(t.respond())
f.close()
diff --git a/setup.py b/setup.py
index fbef2346..cc7a2381 100755
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setup(name='EC2-init',
'cloud-init-cfg.py'
],
data_files=[('/etc/cloud', ['cloud.cfg']),
- ('/etc/ec2-init/templates', glob('templates/*')),
+ ('/etc/cloud/templates', glob('templates/*')),
('/etc/init', glob('upstart/*.conf')),
('/usr/share/ec2-init', []),
('/usr/share/doc/ec2-init', glob('doc/*.txt')),