move from ec2init/ec2-config.cfg to cloud/cloud.cfg

3 files changed, 4 insertions, 3 deletions

diff --git a/cloud.cfg b/cloud.cfg
new file mode 100644
index 00000000..898a8b62
--- /dev/null
+++ b/cloud.cfg
@@ -0,0 +1,3 @@
+cloud_type: auto
+user: ubuntu
+disable_root: 1
diff --git a/ec2-config.cfg b/ec2-config.cfg
deleted file mode 100644
index 6b9992c5..00000000
--- a/ec2-config.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-user=ubuntu
-disable_root=1
diff --git a/setup.py b/setup.py
index cc4b8329..13f54d48 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(name='EC2-init',
                'cloud-init-run-module.py',
                'cloud-init-cfg.py'
                ],
-      data_files=[('/etc/ec2-init', ['ec2-config.cfg']),
+      data_files=[('/etc/cloud', ['cloud.cfg']),
                   ('/etc/ec2-init/templates', glob('templates/*')),
                   ('/etc/init', glob('upstart/*.conf')),
                   ('/usr/share/ec2-init', []),