summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcloud-init-run-module.py2
-rwxr-xr-xcloud-init.py2
-rw-r--r--cloudinit/CloudConfig.py2
-rw-r--r--cloudinit/__init__.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/cloud-init-run-module.py b/cloud-init-run-module.py
index 5a30b081..028129bf 100755
--- a/cloud-init-run-module.py
+++ b/cloud-init-run-module.py
@@ -32,7 +32,7 @@ def main():
(freq,semname,modname)=sys.argv[1:4]
run_args=sys.argv[4:]
- cloud = cloudinit.EC2Init()
+ cloud = cloudinit.CloudInit()
try:
cloud.get_data_source()
except Exception as e:
diff --git a/cloud-init.py b/cloud-init.py
index 501ed4b4..1db2ea60 100755
--- a/cloud-init.py
+++ b/cloud-init.py
@@ -26,7 +26,7 @@ def warn(str):
sys.stderr.write(str)
def main():
- cloud = cloudinit.EC2Init()
+ cloud = cloudinit.CloudInit()
try:
cloud.get_data_source()
diff --git a/cloudinit/CloudConfig.py b/cloudinit/CloudConfig.py
index e15d8f19..32e5c95b 100644
--- a/cloudinit/CloudConfig.py
+++ b/cloudinit/CloudConfig.py
@@ -32,7 +32,7 @@ class CloudConfig():
cfg = None
def __init__(self,cfgfile):
- self.cloud = cloudinit.EC2Init()
+ self.cloud = cloudinit.CloudInit()
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/cloudinit/__init__.py b/cloudinit/__init__.py
index 76aa34f0..65ca6d7f 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -44,7 +44,7 @@ import DataSourceEc2
import UserDataHandler
import util
-class EC2Init:
+class CloudInit:
datasource_map = {
"ec2" : DataSourceEc2.DataSourceEc2,
}