From 0f2d829a2709d049f5606cf89e5c70559024853e Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 29 Jan 2010 13:08:12 -0500
Subject: move etc/ec2-init/templates to etc/cloud/templates

---
 ec2init/util.py | 2 +-
 setup.py        | 2 +-
 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')),
-- 
cgit v1.2.3