From ef8789ded2636f35d554cb9d620d8057591ca39a Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 4 Feb 2010 02:31:53 -0500
Subject: more removal of 'ec2init' string, replacement with cloud-init

---
 cloud-init    | 60 -----------------------------------------------------------
 cloud-init.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py      | 10 +++++-----
 3 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100755 cloud-init
 create mode 100755 cloud-init.py

diff --git a/cloud-init b/cloud-init
deleted file mode 100755
index 723ae3df..00000000
--- a/cloud-init
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/python
-
-import subprocess
-import sys
-
-import cloudinit
-import cloudinit.util as util
-
-def warn(str):
-    sys.stderr.write(str)
-
-def main():
-    cloud = cloudinit.EC2Init()
-
-    try:
-        cloud.get_data_source()
-    except Exception as e:
-        print e
-        sys.stderr.write("Failed to get instance data")
-        sys.exit(1)
-
-    hostname = cloud.get_hostname()
-    subprocess.Popen(['hostname', hostname]).communicate()
-    #print "user data is:" + cloud.get_user_data()
-
-    # store the metadata
-    cloud.update_cache()
-
-    # parse the user data (ec2-run-userdata.py)
-    try:
-        cloud.sem_and_run("consume_userdata", "once-per-instance",
-            cloud.consume_userdata,[],False)
-    except:
-        warn("consuming user data failed!\n")
-        raise
-
-    # set the defaults (like what ec2-set-defaults.py did)
-    try:
-        cloud.sem_and_run("set_defaults", "once-per-instance",
-            set_defaults,[ cloud ],False)
-    except:
-        warn("failed to set defaults\n")
-
-    # finish, send the cloud-config event
-    cloud.initctl_emit()
-
-    sys.exit(0)
-
-def set_defaults(cloud):
-    apply_locale(cloud.get_locale())
-    
-def apply_locale(locale):
-    subprocess.Popen(['locale-gen', locale]).communicate()
-    subprocess.Popen(['update-locale', locale]).communicate()
-
-    util.render_to_file('default-locale', '/etc/default/locale', \
-        { 'locale' : locale })
-
-if __name__ == '__main__':
-    main()
diff --git a/cloud-init.py b/cloud-init.py
new file mode 100755
index 00000000..723ae3df
--- /dev/null
+++ b/cloud-init.py
@@ -0,0 +1,60 @@
+#!/usr/bin/python
+
+import subprocess
+import sys
+
+import cloudinit
+import cloudinit.util as util
+
+def warn(str):
+    sys.stderr.write(str)
+
+def main():
+    cloud = cloudinit.EC2Init()
+
+    try:
+        cloud.get_data_source()
+    except Exception as e:
+        print e
+        sys.stderr.write("Failed to get instance data")
+        sys.exit(1)
+
+    hostname = cloud.get_hostname()
+    subprocess.Popen(['hostname', hostname]).communicate()
+    #print "user data is:" + cloud.get_user_data()
+
+    # store the metadata
+    cloud.update_cache()
+
+    # parse the user data (ec2-run-userdata.py)
+    try:
+        cloud.sem_and_run("consume_userdata", "once-per-instance",
+            cloud.consume_userdata,[],False)
+    except:
+        warn("consuming user data failed!\n")
+        raise
+
+    # set the defaults (like what ec2-set-defaults.py did)
+    try:
+        cloud.sem_and_run("set_defaults", "once-per-instance",
+            set_defaults,[ cloud ],False)
+    except:
+        warn("failed to set defaults\n")
+
+    # finish, send the cloud-config event
+    cloud.initctl_emit()
+
+    sys.exit(0)
+
+def set_defaults(cloud):
+    apply_locale(cloud.get_locale())
+    
+def apply_locale(locale):
+    subprocess.Popen(['locale-gen', locale]).communicate()
+    subprocess.Popen(['update-locale', locale]).communicate()
+
+    util.render_to_file('default-locale', '/etc/default/locale', \
+        { 'locale' : locale })
+
+if __name__ == '__main__':
+    main()
diff --git a/setup.py b/setup.py
index 2a9bdce8..6f6fe303 100755
--- a/setup.py
+++ b/setup.py
@@ -27,17 +27,17 @@ setup(name='EC2-init',
       description='EC2 initialisation magic',
       author='Scott Moser',
       author_email='scott.moser@canonical.com',
-      url='http://launchpad.net/ec2-init/',
+      url='http://launchpad.net/cloud-init/',
       packages=['cloudinit'],
-      scripts=['ec2-init.py',
+      scripts=['cloud-init.py',
                'cloud-init-run-module.py',
                'cloud-init-cfg.py'
                ],
       data_files=[('/etc/cloud', ['cloud.cfg']),
                   ('/etc/cloud/templates', glob('templates/*')),
                   ('/etc/init', glob('upstart/*.conf')),
-                  ('/usr/share/ec2-init', []),
-                  ('/usr/share/doc/ec2-init', glob('doc/*.txt')),
-                  ('/usr/share/doc/ec2-init/examples', glob('doc/examples/*')),
+                  ('/usr/share/cloud-init', []),
+                  ('/usr/share/doc/cloud-init', glob('doc/*.txt')),
+                  ('/usr/share/doc/cloud-init/examples', glob('doc/examples/*')),
                   ],
       )
-- 
cgit v1.2.3