diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-01-17 15:30:04 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-01-17 15:30:04 -0500 |
| commit | 605335f4732246ef89b94dcc542e73f13fdef1c9 (patch) | |
| tree | 7e0ac9e33408102a04342db5b54ee0a520ef64ec /tests/unittests/test_runs/test_merge_run.py | |
| parent | 98fd17c55b637f4e1d136c954567c1d9b23e6c20 (diff) | |
| parent | 1729b161c7569ec60ac6102a046e0b8c22457b7c (diff) | |
| download | vyos-cloud-init-605335f4732246ef89b94dcc542e73f13fdef1c9.tar.gz vyos-cloud-init-605335f4732246ef89b94dcc542e73f13fdef1c9.zip | |
initial vendordata support
This adds the ability for a datasource to provide "vendordata".
The difference here is that vendordata is from the vendor (cloud provider)
where user-data is from the user. By enabling this channel, the vendor
can have input on how the instance is set up without modifying or needing
to understand the user-data.
vendordata is generally consumed exactly like user-data, but the user
has the ability to disable its consumption.
The only datasource supporting this at the moment is SmartOS.
Diffstat (limited to 'tests/unittests/test_runs/test_merge_run.py')
| -rw-r--r-- | tests/unittests/test_runs/test_merge_run.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unittests/test_runs/test_merge_run.py b/tests/unittests/test_runs/test_merge_run.py index d9c3a455..5ffe95a2 100644 --- a/tests/unittests/test_runs/test_merge_run.py +++ b/tests/unittests/test_runs/test_merge_run.py @@ -35,8 +35,8 @@ class TestMergeRun(helpers.FilesystemMockingTestCase): initer.datasource.userdata_raw = ud _iid = initer.instancify() initer.update() - initer.cloudify().run('consume_userdata', - initer.consume_userdata, + initer.cloudify().run('consume_data', + initer.consume_data, args=[PER_INSTANCE], freq=PER_INSTANCE) mirrors = initer.distro.get_option('package_mirrors') |