diff options
| author | Ben Howard <ben.howard@canonical.com> | 2014-02-07 10:10:02 +0200 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2014-02-07 10:10:02 +0200 |
| commit | 3087da32ec5cf84c51e0ebdd80a71a84b174a392 (patch) | |
| tree | 1918a08395e97dbd84bbf43c65c5740bf4ee3365 /bin | |
| parent | 4fe439b9e137e0b59d00e919dc16aea9da35082a (diff) | |
| parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
| download | vyos-cloud-init-3087da32ec5cf84c51e0ebdd80a71a84b174a392.tar.gz vyos-cloud-init-3087da32ec5cf84c51e0ebdd80a71a84b174a392.zip | |
Rebase on upstream
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 |