summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcloud-init-cfg.py40
-rw-r--r--ec2init/CloudConfig.py155
-rw-r--r--ec2init/ec2config.py92
-rwxr-xr-xsetup.py3
-rw-r--r--upstart/cloud-apt-update-upgrade.conf (renamed from upstart/ec2-update-software.conf)4
-rw-r--r--upstart/cloud-config-ssh.conf (renamed from upstart/ec2-preconf-ssh-keys.conf)6
-rw-r--r--upstart/cloud-ebs-mounts.conf (renamed from upstart/ec2-ebs-mounts.conf)2
-rw-r--r--upstart/cloud-raid.conf (renamed from upstart/ec2-raid.conf)2
-rw-r--r--upstart/cloud-run-user-script.conf2
-rw-r--r--upstart/cloud-runurl.conf (renamed from upstart/ec2-runurl.conf)2
-rw-r--r--upstart/ec2-apt-update.conf13
11 files changed, 206 insertions, 115 deletions
diff --git a/cloud-init-cfg.py b/cloud-init-cfg.py
new file mode 100755
index 00000000..88216e10
--- /dev/null
+++ b/cloud-init-cfg.py
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+
+import sys
+import ec2init
+
+def Usage(out = sys.stdout):
+ out.write("Usage: %s name\n" % sys.argv[0])
+
+def main():
+ # expect to be called with
+ # name freq [ args ]
+ if len(sys.argv) < 2:
+ Usage(sys.stderr)
+ sys.exit(1)
+
+ name=sys.argv[1]
+ run_args=sys.argv[2:]
+
+ import ec2init.CloudConfig
+ import os
+
+ cfg_path = ec2init.cloud_config
+ cfg_env_name = ec2init.cfg_env_name
+ if os.environ.has_key(cfg_env_name):
+ cfg_path = os.environ[cfg_env_name]
+
+ cc = ec2init.CloudConfig.CloudConfig(cfg_path)
+
+ try:
+ cc.handle(name,run_args)
+ except:
+ import traceback
+ traceback.print_exc(file=sys.stderr)
+ sys.stderr.write("config handling of %s failed\n" % name)
+ sys.exit(1)
+
+ sys.exit(0)
+
+if __name__ == '__main__':
+ main()
diff --git a/ec2init/CloudConfig.py b/ec2init/CloudConfig.py
new file mode 100644
index 00000000..3ba84154
--- /dev/null
+++ b/ec2init/CloudConfig.py
@@ -0,0 +1,155 @@
+#
+# Common code for the EC2 configuration files in Ubuntu
+# Copyright (C) 2008-2010 Canonical Ltd.
+#
+# Author: Chuck Short <chuck.short@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+import yaml
+import re
+import ec2init
+import subprocess
+import os
+
+per_instance="once-per-instance"
+
+class CloudConfig():
+ cfgfile = None
+ handlers = { }
+ cfg = None
+
+ def __init__(self,cfgfile):
+ print "reading %s" % cfgfile
+ self.cfg=read_conf(cfgfile)
+ import pprint; pprint.pprint(self.cfg)
+ self.cloud = ec2init.EC2Init()
+ self.cloud.get_data_source()
+ self.add_handler('apt-update-upgrade', self.h_apt_update_upgrade)
+ self.add_handler('config-ssh')
+
+ def add_handler(self, name, handler=None, freq=None):
+ if handler is None:
+ try:
+ handler=getattr(self,'h_%s' % name.replace('-','_'))
+ except:
+ raise Exception("Unknown hander for name %s" %name)
+ if freq is None:
+ freq = per_instance
+
+ self.handlers[name]= { 'handler': handler, 'freq': freq }
+
+ def get_handler_info(self, name):
+ return(self.handlers[name]['handler'], self.handlers[name]['freq'])
+
+ def check_for_updates(self):
+ value = self.cfg['apt_update']
+ return value
+
+ def check_for_upgrade(self):
+ value = self.cfg['apt_upgrade']
+ return value
+
+ def parse_ssh_keys(self):
+ disableRoot = self.cfg['disable_root']
+ if disableRoot == 'true':
+ value = 'disabled_root'
+ return value
+ else:
+ ec2Key = self.cfg['ec2_fetch_key']
+ if ec2Key != 'none':
+ value = 'default_key'
+ return value
+ else:
+ return ec2Key
+
+ def add_ppa(self):
+ #value = self.cfg['apt_sources']
+ for ent in self.cfg['apt_sources']:
+ ppa = ent['source']
+ where = ppa.find('ppa:')
+ if where != -1:
+ return ppa
+
+ def add_custom_repo(self):
+ sources = []
+ value = self.cfg['apt_sources']
+ for ent in self.cfg['apt_sources']:
+ if ent.has_key('keyserver'):
+ keyserver = ent['keyserver']
+ if ent.has_key('keyid'):
+ keyid = ent['keyid']
+ if ent.has_key('filename'):
+ filename = ent['filename']
+ source = ent['source']
+ if source.startswith("deb"):
+ sources.append(source)
+
+ return (keyserver,sources,keyid,filename)
+
+ def handle(self, name, args):
+ handler = None
+ freq = None
+ try:
+ (handler, freq) = self.get_handler_info(name)
+ except:
+ raise Exception("Unknown config key %s\n", name)
+
+ self.cloud.sem_and_run(name, freq, handler, [ name, args ])
+
+ def h_apt_update_upgrade(self,name,args):
+ update = get_cfg_option_bool(self.cfg, 'apt_update', False)
+ upgrade = get_cfg_option_bool(self.cfg, 'apt_upgrade', False)
+
+ print "update = %s , upgrade = %s\n" % (update,upgrade)
+ if update or upgrade:
+ #retcode = subprocess.call(list)
+ subprocess.Popen(['apt-get', 'update']).communicate()
+
+ if upgrade:
+ e=os.environ.copy()
+ e['DEBIAN_FRONTEND']='noninteractive'
+ subprocess.Popen(['apt-get', 'upgrade', '--assume-yes'], env=e).communicate()
+
+ return(True)
+
+ 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):
+ print "Warning, not doing anything for config %s" % name
+
+ def h_config_setup_raid(self,name,args):
+ print "Warning, not doing anything for config %s" % name
+
+ def h_config_runurl(self,name,args):
+ print "Warning, not doing anything for config %s" % name
+
+
+def get_cfg_option_bool(yobj, key, default=False):
+ print "searching for %s" % key
+ if not yobj.has_key(key): return default
+ val = yobj[key]
+ if yobj[key] in [ True, '1', 'on', 'yes', 'true']:
+ return True
+ return False
+
+def get_cfg_option_str(yobj, key, default=None):
+ if not yobj.has_key(key): return default
+ return yobj[key]
+
+def read_conf(fname):
+ stream = file(fname)
+ conf = yaml.load(stream)
+ stream.close()
+ return conf
diff --git a/ec2init/ec2config.py b/ec2init/ec2config.py
deleted file mode 100644
index 23ab5ac3..00000000
--- a/ec2init/ec2config.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Common code for the EC2 configuration files in Ubuntu
-# Copyright (C) 2008-2010 Canonical Ltd.
-#
-# Author: Chuck Short <chuck.short@canonical.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-import yaml
-import re
-
-class EC2Config():
- def read_conf(self, ec2Config):
- #stream = file('/tmp/ec2.yaml')
- ec2Config = yaml.load(stream)
- stream.close()
- return ec2Config
-
- def check_for_updates(self):
- #stream = file('/tmp/ec2.yaml')
- ec2Config = yaml.load(stream)
- stream.close()
-
- value = ec2Config['apt_update']
- return value
-
- def check_for_upgrade(self):
- #stream = file('/tmp/ec2.yaml')
- ec2Config = yaml.load(stream)
- stream.close()
-
- value = ec2Config['apt_upgrade']
- return value
-
- def parse_ssh_keys(self):
- #stream = file('/tmp/ec2.yaml')
- ec2Config = yaml.load(stream)
- stream.close()
-
- disableRoot = ec2Config['disable_root']
- if disableRoot == 'true':
- value = 'disabled_root'
- return value
- else:
- ec2Key = ec2Config['ec2_fetch_key']
- if ec2Key != 'none':
- value = 'default_key'
- return value
- else:
- return ec2Key
-
- def add_ppa(self):
- stream = file('/tmp/ec2.yaml')
- ec2Config = yaml.load(stream)
- stream.close()
-
- value = ec2Config['apt_sources']
- for ent in ec2Config['apt_sources']:
- ppa = ent['source']
- where = ppa.find('ppa:')
- if where != -1:
- return ppa
-
- def add_custom_repo(self):
- stream = file('/tmp/ec2.yaml')
- ec2Config = yaml.load(stream)
- stream.close()
-
- sources = []
- value = ec2Config['apt_sources']
- for ent in ec2Config['apt_sources']:
- if ent.has_key('keyserver'):
- keyserver = ent['keyserver']
- if ent.has_key('keyid'):
- keyid = ent['keyid']
- if ent.has_key('filename'):
- filename = ent['filename']
- source = ent['source']
- if source.startswith("deb"):
- sources.append(source)
-
- return (keyserver,sources,keyid,filename)
diff --git a/setup.py b/setup.py
index 4b4d0ae7..cc4b8329 100755
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,8 @@ setup(name='EC2-init',
packages=['ec2init'],
scripts=['ec2-init.py',
'ec2-is-compat-env',
- 'cloud-init-run-module.py'
+ 'cloud-init-run-module.py',
+ 'cloud-init-cfg.py'
],
data_files=[('/etc/ec2-init', ['ec2-config.cfg']),
('/etc/ec2-init/templates', glob('templates/*')),
diff --git a/upstart/ec2-update-software.conf b/upstart/cloud-apt-update-upgrade.conf
index ee3131d1..a5060f69 100644
--- a/upstart/ec2-update-software.conf
+++ b/upstart/cloud-apt-update-upgrade.conf
@@ -6,7 +6,7 @@ description "Update software at boot"
start on (cloud-config
and local-filesystem
- and net-device-iup IFACE=eth0)
+ and net-device-up IFACE=eth0)
console output
-exec /usr/sbin/ec2-update-software
+exec cloud-init-cfg apt-update-upgrade
diff --git a/upstart/ec2-preconf-ssh-keys.conf b/upstart/cloud-config-ssh.conf
index 383b5bbc..65d29941 100644
--- a/upstart/ec2-preconf-ssh-keys.conf
+++ b/upstart/cloud-config-ssh.conf
@@ -6,8 +6,8 @@ description "Download preconfigured ssh keys"
start on (cloud-config
and local-filesystem
- and net-device-ifup IFACE=eth0)
-console out
+ and net-device-ifup IFACE=eth0 and starting ssh)
+console output
task
-exec /usr/sbin/ec2-preconf-ssh-keys
+exec cloud-init-cfg config-ssh
diff --git a/upstart/ec2-ebs-mounts.conf b/upstart/cloud-ebs-mounts.conf
index a1457f6a..03ddfa40 100644
--- a/upstart/ec2-ebs-mounts.conf
+++ b/upstart/cloud-ebs-mounts.conf
@@ -9,4 +9,4 @@ start on cloud-config
console output
task
-exec /usr/sbin/ec2-ebs-mount
+exec cloud-init-cfg ec2-ebs-mounts
diff --git a/upstart/ec2-raid.conf b/upstart/cloud-raid.conf
index e4364373..d4644c89 100644
--- a/upstart/ec2-raid.conf
+++ b/upstart/cloud-raid.conf
@@ -9,4 +9,4 @@ start on (cloud-config
console output
task
-exec /usr/sbin/ec2-setup-raid
+exec cloud-init-cfg setup-raid
diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf
index cf76fe32..272bc409 100644
--- a/upstart/cloud-run-user-script.conf
+++ b/upstart/cloud-run-user-script.conf
@@ -3,7 +3,7 @@
description "execute cloud user scripts"
-start on (stopped rc RUNLEVEL=[2345] and cloud-config)
+start on (stopped ec2init and stopped rc RUNLEVEL=[2345])
console output
task
diff --git a/upstart/ec2-runurl.conf b/upstart/cloud-runurl.conf
index 28249f8d..f2140c32 100644
--- a/upstart/ec2-runurl.conf
+++ b/upstart/cloud-runurl.conf
@@ -10,4 +10,4 @@ start on (cloud-config
console output
task
-exec /usr/sbin/ec2-runurl
+exec cloud-init-cfg runurl
diff --git a/upstart/ec2-apt-update.conf b/upstart/ec2-apt-update.conf
deleted file mode 100644
index b280801b..00000000
--- a/upstart/ec2-apt-update.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# ec2-apt-update - Update archive at boot time
-#
-# Update archive at boot
-
-description "Update archive at boot"
-
-start on (cloud-config
- and local-filesystems
- and net-device-up IFACE=eth0)
-console output
-task
-# exec /usr/sbin/cloud-init-run --once ec2-apt-update ec2-apt-update
-exec /usr/sbin/ec2-apt-update
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 08:55:52 +0000