diff options
author | Scott Moser <smoser@ubuntu.com> | 2011-08-02 17:09:43 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2011-08-02 17:09:43 -0400 |
commit | 9d4a9dc17696d0465ae4f8b56db9c0948fcac28c (patch) | |
tree | 77b6c6c2d98016524f4191786dd6e89f2e28090b /cloudinit/CloudConfig/cc_bootcmd.py | |
parent | fb0150dd71bf54bd46e30efab62dbb2f6eca2ba2 (diff) | |
download | vyos-cloud-init-9d4a9dc17696d0465ae4f8b56db9c0948fcac28c.tar.gz vyos-cloud-init-9d4a9dc17696d0465ae4f8b56db9c0948fcac28c.zip |
This fixes LP: #819507, to make consume_userdata run 'always'
consume_userdata should really run always, rather than once per instance.
The documentation says that boothooks were on their own for per-instance
but since this routine was only being called once, they would only get
called once.
This modifies the behavior to be:
user_script: per_always
cloud_config : per_always
upstart_job : per_instance
cloud_boothook: per_always
In order to not break part handlers that are existing, and expect to only be
called once per instance, this adds a 'handler_version' item in a handler
that can indicate the version (currently 1 or 2). If it is 2, then the
hander will be passed the frequency (per-instance or per-always) that this
is being run. That way the handler can differenciate between them.
This also makes 'bootcmd' run every boot. That should be changable in
cloud-config though, so users who dont like the behavior can modify it.
LP: #819507
Diffstat (limited to 'cloudinit/CloudConfig/cc_bootcmd.py')
-rw-r--r-- | cloudinit/CloudConfig/cc_bootcmd.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/CloudConfig/cc_bootcmd.py b/cloudinit/CloudConfig/cc_bootcmd.py index 9eccfd78..11e9938c 100644 --- a/cloudinit/CloudConfig/cc_bootcmd.py +++ b/cloudinit/CloudConfig/cc_bootcmd.py @@ -18,6 +18,8 @@ import cloudinit.util as util import subprocess import tempfile +from cloudinit.CloudConfig import per_always +frequency = per_always def handle(name,cfg,cloud,log,args): if not cfg.has_key("bootcmd"): |