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.

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