diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-01-23 15:17:17 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-01-23 15:17:17 -0500 |
| commit | 573ee6d9d641356374ac616f53cb254d4da7c9db (patch) | |
| tree | e96228256276875c47c5031160bd2f3cbe3b5398 /bin | |
| parent | 1781668dd65737a800c2c8fdbb79c6f1288d3ef2 (diff) | |
| parent | c833a84f08019ba4413937f2f1b1f12a4ffe5632 (diff) | |
| download | vyos-cloud-init-573ee6d9d641356374ac616f53cb254d4da7c9db.tar.gz vyos-cloud-init-573ee6d9d641356374ac616f53cb254d4da7c9db.zip | |
merge from trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cloud-init | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/cloud-init b/bin/cloud-init index b4f9fd07..80a1df05 100755 --- a/bin/cloud-init +++ b/bin/cloud-init @@ -261,8 +261,8 @@ def main_init(name, args): # Attempt to consume the data per instance. # This may run user-data handlers and/or perform # url downloads and such as needed. - (ran, _results) = init.cloudify().run('consume_userdata', - init.consume_userdata, + (ran, _results) = init.cloudify().run('consume_data', + init.consume_data, args=[PER_INSTANCE], freq=PER_INSTANCE) if not ran: @@ -271,7 +271,7 @@ def main_init(name, args): # # See: https://bugs.launchpad.net/bugs/819507 for a little # reason behind this... - init.consume_userdata(PER_ALWAYS) + init.consume_data(PER_ALWAYS) except Exception: util.logexc(LOG, "Consuming user data failed!") return 1 |