diff options
| author | Scott Moser <smoser@nelson> | 2010-01-12 15:09:27 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@nelson> | 2010-01-12 15:09:27 -0500 |
| commit | 1376ffe4de1e9cdcf5544ccecf50a18f46f7ed30 (patch) | |
| tree | a480cffe9ec2a91baeb51ad31648852d79211841 | |
| parent | 86d8955a5ca3e374fcabe7f6b0f9ebfe47d47441 (diff) | |
| download | vyos-cloud-init-1376ffe4de1e9cdcf5544ccecf50a18f46f7ed30.tar.gz vyos-cloud-init-1376ffe4de1e9cdcf5544ccecf50a18f46f7ed30.zip | |
moving towards getting apt-update-upgrade working
| -rw-r--r-- | ec2init/CloudConfig.py | 7 | ||||
| -rw-r--r-- | upstart/cloud-apt-update-upgrade.conf | 2 | ||||
| -rw-r--r-- | upstart/cloud-config-ssh.conf.disabled (renamed from upstart/cloud-config-ssh.conf) | 2 | ||||
| -rw-r--r-- | upstart/cloud-ebs-mounts.conf.disabled (renamed from upstart/cloud-ebs-mounts.conf) | 0 | ||||
| -rw-r--r-- | upstart/cloud-raid.conf.disabled (renamed from upstart/cloud-raid.conf) | 2 | ||||
| -rw-r--r-- | upstart/cloud-runurl.conf.disabled (renamed from upstart/cloud-runurl.conf) | 2 |
6 files changed, 7 insertions, 8 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): diff --git a/upstart/cloud-apt-update-upgrade.conf b/upstart/cloud-apt-update-upgrade.conf index a5060f69..bf21cd8b 100644 --- a/upstart/cloud-apt-update-upgrade.conf +++ b/upstart/cloud-apt-update-upgrade.conf @@ -5,7 +5,7 @@ description "Update software at boot" start on (cloud-config - and local-filesystem + and local-filesystems and net-device-up IFACE=eth0) console output diff --git a/upstart/cloud-config-ssh.conf b/upstart/cloud-config-ssh.conf.disabled index 65d29941..6127cb73 100644 --- a/upstart/cloud-config-ssh.conf +++ b/upstart/cloud-config-ssh.conf.disabled @@ -5,7 +5,7 @@ description "Download preconfigured ssh keys" start on (cloud-config - and local-filesystem + and local-filesystems and net-device-ifup IFACE=eth0 and starting ssh) console output task diff --git a/upstart/cloud-ebs-mounts.conf b/upstart/cloud-ebs-mounts.conf.disabled index 03ddfa40..03ddfa40 100644 --- a/upstart/cloud-ebs-mounts.conf +++ b/upstart/cloud-ebs-mounts.conf.disabled diff --git a/upstart/cloud-raid.conf b/upstart/cloud-raid.conf.disabled index d4644c89..d18dd551 100644 --- a/upstart/cloud-raid.conf +++ b/upstart/cloud-raid.conf.disabled @@ -5,7 +5,7 @@ description "Setup RAID storage and moint points" start on (cloud-config - and local-filesystem) + and local-filesystems) console output task diff --git a/upstart/cloud-runurl.conf b/upstart/cloud-runurl.conf.disabled index f2140c32..3e2c46e0 100644 --- a/upstart/cloud-runurl.conf +++ b/upstart/cloud-runurl.conf.disabled @@ -5,7 +5,7 @@ description "Run runurl" start on (cloud-config - and local-filesystem + and local-filesystems and net-device-ifup IFACE=eth0) console output task |