diff options
author | Scott Moser <smoser@ubuntu.com> | 2011-01-24 19:51:57 +0000 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2011-01-24 19:51:57 +0000 |
commit | 516e378f0e79d127baeac8c6418efc504d3b713e (patch) | |
tree | fe42f6a15de8d0d3145752a156c0db92ba161d45 /cloudinit/util.py | |
parent | b9b0a79b5a1b142b9e1176d64f294cf9c9f84157 (diff) | |
download | vyos-cloud-init-516e378f0e79d127baeac8c6418efc504d3b713e.tar.gz vyos-cloud-init-516e378f0e79d127baeac8c6418efc504d3b713e.zip |
move cloud-run-user-script.conf to cloud-final, use cloud-cfg for invoking
This moves what was done as cloud-run-user-script.conf to 'cloud-final'
and makes that re-use the cloud-init-cfg code, but simply with a different
set of default configs.
Also, adds keys_to_console and final_message cloud-config modules
LP: #653271
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r-- | cloudinit/util.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index f8c847aa..96e93af2 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -127,6 +127,16 @@ def getkeybyid(keyid,keyserver): args=['sh', '-c', shcmd, "export-gpg-keyid", keyid, keyserver] return(subp(args)[0]) +def runparts(dirp, skip_no_exist=True): + if skip_no_exist and not os.path.isdir(dirp): return + + cmd = [ 'run-parts', '--regex', '.*', dirp ] + sp = subprocess.Popen(cmd) + sp.communicate() + if sp.returncode is not 0: + raise subprocess.CalledProcessError(sp.returncode,cmd) + return + def subp(args, input=None): s_in = None if input is not None: |