diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-12-20 12:02:39 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-12-20 12:02:39 -0500 |
| commit | b17a271da699230be8dad5d8c0227a5c7c238503 (patch) | |
| tree | fc0f9419f83f8533cf6d6259b45c195795f4bb94 /cloudinit/CloudConfig/cc_bootcmd.py | |
| parent | 13015ef25fa7e748e916c99f083e338b28861a18 (diff) | |
| parent | 57a28850fae6098a32e7c16ab90541fd785684cb (diff) | |
| download | vyos-cloud-init-b17a271da699230be8dad5d8c0227a5c7c238503.tar.gz vyos-cloud-init-b17a271da699230be8dad5d8c0227a5c7c238503.zip | |
add INSTANCE_ID to env of bootcmd, add cloud-init-per
the environment varible INSTANCE_ID is set when invoking boothooks from
multi-part input. However, previously that was not the case for things
run via bootcmd.
This adds cloud-init-per, which makes it easy for user in bootcmd or
boothook to do something per 'instance', 'always', or 'once'.
The functionality in cloud-init-per mostly duplicated what was in
cloud-init-run-module. That supported "modules", but it is unlikely
that it was used for anything other than "execute". So, cloud-init-per
now replaces cloud-init-run-module and provides legacy support for
the 'execute' path.
Diffstat (limited to 'cloudinit/CloudConfig/cc_bootcmd.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_bootcmd.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/CloudConfig/cc_bootcmd.py b/cloudinit/CloudConfig/cc_bootcmd.py index 11e9938c..5a9e4356 100644 --- a/cloudinit/CloudConfig/cc_bootcmd.py +++ b/cloudinit/CloudConfig/cc_bootcmd.py @@ -35,7 +35,9 @@ def handle(name,cfg,cloud,log,args): raise try: - subprocess.check_call(['/bin/sh'], stdin=tmpf) + env=os.environ.copy() + env['INSTANCE_ID']=cloud.get_instance_id() + subprocess.check_call(['/bin/sh'], env=env, stdin=tmpf) tmpf.close() except: log.warn("failed to run commands from bootcmd") |