summaryrefslogtreecommitdiff
path: root/ec2init
diff options
context:
space:
mode:
authorScott Moser <smoser@nelson>2010-01-12 15:09:27 -0500
committerScott Moser <smoser@nelson>2010-01-12 15:09:27 -0500
commit1376ffe4de1e9cdcf5544ccecf50a18f46f7ed30 (patch)
treea480cffe9ec2a91baeb51ad31648852d79211841 /ec2init
parent86d8955a5ca3e374fcabe7f6b0f9ebfe47d47441 (diff)
downloadvyos-cloud-init-1376ffe4de1e9cdcf5544ccecf50a18f46f7ed30.tar.gz
vyos-cloud-init-1376ffe4de1e9cdcf5544ccecf50a18f46f7ed30.zip
moving towards getting apt-update-upgrade working
Diffstat (limited to 'ec2init')
-rw-r--r--ec2init/CloudConfig.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/ec2init/CloudConfig.py b/ec2init/CloudConfig.py
index 3ba84154..bea8810c 100644
--- a/ec2init/CloudConfig.py
+++ b/ec2init/CloudConfig.py
@@ -30,9 +30,8 @@ class CloudConfig():
cfg = None
def __init__(self,cfgfile):
- print "reading %s" % cfgfile
- self.cfg=read_conf(cfgfile)
import pprint; pprint.pprint(self.cfg)
+ self.cfg=read_conf(cfgfile)
self.cloud = ec2init.EC2Init()
self.cloud.get_data_source()
self.add_handler('apt-update-upgrade', self.h_apt_update_upgrade)
@@ -103,7 +102,7 @@ class CloudConfig():
try:
(handler, freq) = self.get_handler_info(name)
except:
- raise Exception("Unknown config key %s\n", name)
+ raise Exception("Unknown config key %s\n" % name)
self.cloud.sem_and_run(name, freq, handler, [ name, args ])
@@ -126,7 +125,7 @@ class CloudConfig():
def h_config_ssh(self,name,args):
print "Warning, not doing anything for config %s" % name
- def h_config_ec2_ebs_mounts(self,name,args):
+ def h_ec2_ebs_mounts(self,name,args):
print "Warning, not doing anything for config %s" % name
def h_config_setup_raid(self,name,args):