change 'default' encoding to be "None"

Instead of just trying to see if userdata decodes as the indication that
it should be encoded, the user must explicitly set this.

The "just try it" will fail in the case where the user had other use
of user-data and wanted a blob of data to go through unrecognized by
cloud-init.

In cases where there can be mistake in automatic behavior,
and some users may be relaying on old behavior, its best to just require
explicit use.

1 files changed, 3 insertions, 2 deletions

diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
index d91b80ab..34557f8b 100644
--- a/cloudinit/sources/DataSourceOpenNebula.py
+++ b/cloudinit/sources/DataSourceOpenNebula.py
@@ -422,8 +422,9 @@ def read_context_disk_dir(source_dir, asuser=None):
 
     # b64decode user data if necessary (default)
     if 'userdata' in results:
-        userdata_encoding = context.get('USERDATA_ENCODING', None)
-        if userdata_encoding in (None, "base64"):
+        encoding = context.get('USERDATA_ENCODING',
+                               context.get('USER_DATA_ENCODING'))
+        if encoding == "base64":
             try:
                 results['userdata'] = base64.b64decode(results['userdata'])
             except TypeError: