globally remove ec2init and rename to cloudinit

13 files changed, 22 insertions, 22 deletions

diff --git a/cloud-init-cfg.py b/cloud-init-cfg.py
index 88216e10..9260a767 100755
--- a/cloud-init-cfg.py
+++ b/cloud-init-cfg.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import sys
-import ec2init
+import cloudinit
 
 def Usage(out = sys.stdout):
     out.write("Usage: %s name\n" % sys.argv[0])
@@ -16,15 +16,15 @@ def main():
     name=sys.argv[1]
     run_args=sys.argv[2:]
 
-    import ec2init.CloudConfig
+    import cloudinit.CloudConfig
     import os
 
-    cfg_path = ec2init.cloud_config
-    cfg_env_name = ec2init.cfg_env_name
+    cfg_path = cloudinit.cloud_config
+    cfg_env_name = cloudinit.cfg_env_name
     if os.environ.has_key(cfg_env_name):
         cfg_path = os.environ[cfg_env_name]
 
-    cc = ec2init.CloudConfig.CloudConfig(cfg_path)
+    cc = cloudinit.CloudConfig.CloudConfig(cfg_path)
 
     try:
         cc.handle(name,run_args)
diff --git a/cloud-init-run-module.py b/cloud-init-run-module.py
index d2d4feee..de52f116 100755
--- a/cloud-init-run-module.py
+++ b/cloud-init-run-module.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import sys
-import ec2init
+import cloudinit
 
 def Usage(out = sys.stdout):
     out.write("Usage: cloud-init-run-module freq sem-name mod-name [args]\n")
@@ -16,7 +16,7 @@ def main():
     (freq,semname,modname)=sys.argv[1:4]
     run_args=sys.argv[4:]
 
-    cloud = ec2init.EC2Init()
+    cloud = cloudinit.EC2Init()
     try:
         cloud.get_data_source()
     except Exception as e:
@@ -29,16 +29,16 @@ def main():
         sys.exit(0)
 
     try:
-        mod = __import__('ec2init.' + modname)
+        mod = __import__('cloudinit.' + modname)
         inst = getattr(mod,modname)
     except:
-        sys.stderr.write("Failed to load module ec2init.%s\n" % modname)
+        sys.stderr.write("Failed to load module cloudinit.%s\n" % modname)
         sys.exit(1)
 
     import os
 
     cfg_path = None
-    cfg_env_name = ec2init.cfg_env_name
+    cfg_env_name = cloudinit.cfg_env_name
     if os.environ.has_key(cfg_env_name):
         cfg_path = os.environ[cfg_env_name]
 
diff --git a/ec2init/CloudConfig.py b/cloudinit/CloudConfig.py
index d1699f09..4a498866 100644
--- a/ec2init/CloudConfig.py
+++ b/cloudinit/CloudConfig.py
@@ -18,8 +18,8 @@
 #
 import yaml
 import re
-import ec2init
-import ec2init.util as util
+import cloudinit
+import cloudinit.util as util
 import subprocess
 import os
 import glob
@@ -33,7 +33,7 @@ class CloudConfig():
     cfg = None
 
     def __init__(self,cfgfile):
-        self.cloud = ec2init.EC2Init()
+        self.cloud = cloudinit.EC2Init()
         self.cfg = self.get_config_obj(cfgfile)
         self.cloud.get_data_source()
         self.add_handler('apt-update-upgrade', self.h_apt_update_upgrade)
diff --git a/ec2init/DataSource.py b/cloudinit/DataSource.py
index 9fe38b17..9af2eda4 100644
--- a/ec2init/DataSource.py
+++ b/cloudinit/DataSource.py
@@ -1,5 +1,5 @@
 
-import ec2init
+import cloudinit
 import UserDataHandler as ud
 
 class DataSource:
diff --git a/ec2init/DataSourceEc2.py b/cloudinit/DataSourceEc2.py
index dae2873d..a4906af2 100644
--- a/ec2init/DataSourceEc2.py
+++ b/cloudinit/DataSourceEc2.py
@@ -1,6 +1,6 @@
 import DataSource
 
-import ec2init
+import cloudinit
 import socket
 import urllib2
 import time
@@ -8,7 +8,7 @@ import boto_utils
 
 class DataSourceEc2(DataSource.DataSource):
     api_ver  = '2009-04-04'
-    cachedir = ec2init.cachedir + '/ec2'
+    cachedir = cloudinit.cachedir + '/ec2'
 
     location_locale_map = { 
         'us' : 'en_US.UTF-8',
diff --git a/ec2init/UserDataHandler.py b/cloudinit/UserDataHandler.py
index 56feb0ff..56feb0ff 100644
--- a/ec2init/UserDataHandler.py
+++ b/cloudinit/UserDataHandler.py
diff --git a/ec2init/__init__.py b/cloudinit/__init__.py
index 76aa34f0..76aa34f0 100644
--- a/ec2init/__init__.py
+++ b/cloudinit/__init__.py
diff --git a/ec2init/boto_utils.py b/cloudinit/boto_utils.py
index 2f9de95f..2f9de95f 100644
--- a/ec2init/boto_utils.py
+++ b/cloudinit/boto_utils.py
diff --git a/ec2init/execute.py b/cloudinit/execute.py
index 033da8f7..033da8f7 100644
--- a/ec2init/execute.py
+++ b/cloudinit/execute.py
diff --git a/ec2init/util.py b/cloudinit/util.py
index 9b9f6f4d..9b9f6f4d 100644
--- a/ec2init/util.py
+++ b/cloudinit/util.py
diff --git a/ec2-init.py b/ec2-init.py
index 06662f7b..723ae3df 100755
--- a/ec2-init.py
+++ b/ec2-init.py
@@ -3,14 +3,14 @@
 import subprocess
 import sys
 
-import ec2init
-import ec2init.util as util
+import cloudinit
+import cloudinit.util as util
 
 def warn(str):
     sys.stderr.write(str)
 
 def main():
-    cloud = ec2init.EC2Init()
+    cloud = cloudinit.EC2Init()
 
     try:
         cloud.get_data_source()
diff --git a/setup.py b/setup.py
index 92c2c79f..2a9bdce8 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setup(name='EC2-init',
       author='Scott Moser',
       author_email='scott.moser@canonical.com',
       url='http://launchpad.net/ec2-init/',
-      packages=['ec2init'],
+      packages=['cloudinit'],
       scripts=['ec2-init.py',
                'cloud-init-run-module.py',
                'cloud-init-cfg.py'
diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf
index 272bc409..3e5089d5 100644
--- a/upstart/cloud-run-user-script.conf
+++ b/upstart/cloud-run-user-script.conf
@@ -1,9 +1,9 @@
 # this runs user scripts found in user-data, that are
-# stored in /var/lib/cloud/scripts by the initial ec2init upstart job
+# stored in /var/lib/cloud/scripts by the initial cloudinit upstart job
 
 description "execute cloud user scripts"
 
-start on (stopped ec2init and stopped rc RUNLEVEL=[2345])
+start on (stopped cloudinit and stopped rc RUNLEVEL=[2345])
 console output
 task