Merge ~nniehoff/maas:nniehoff-vendor-data-feature into maas:master

[Nick Niehoff]

[MAAS Lander (maas-lander)]

UNIT TESTS
-b nniehoff-vendor-data-feature lp:~nniehoff/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/7143/console
COMMIT: d8ddda539b9c2a033eef839c478706c83912a73b

review: Needs Fixing

[Adam Collard (adam-collard)]

Posted a comment on the linked bug with request for more information

review: Needs Information

Unmerged commits

d8ddda5... by Nick Niehoff on 2020-02-18

Adding Support for cloud-init vendor data

diff --git a/src/metadataserver/vendor_data.py b/src/metadataserver/vendor_data.py
index 54c8019..2ff6aec 100644
--- a/src/metadataserver/vendor_data.py
+++ b/src/metadataserver/vendor_data.py
@@ -9,6 +9,7 @@ from base64 import b64encode
 from crypt import crypt
 from itertools import chain
 from os import urandom
+from os import path
 
 from netaddr import IPAddress
 import yaml
@@ -20,13 +21,16 @@ from maasserver.permissions import NodePermission
 from maasserver.preseed import get_network_yaml_settings
 from maasserver.preseed_network import NodeNetworkConfiguration
 from maasserver.server_address import get_maas_facing_server_host
+from metadataserver import logger
 from provisioningserver.ntp.config import normalise_address
 from provisioningserver.utils.text import make_gecos_field
 from provisioningserver.utils.version import get_maas_version_track_channel
 
 
 def get_vendor_data(node, proxy):
-    return dict(
+    """Generate cloud-init vendor data for the given node."""
+    vendordata = dict(load_local_data())
+    generated_data = dict(
         chain(
             generate_system_info(node),
             generate_ntp_configuration(node),
@@ -37,6 +41,23 @@ def get_vendor_data(node, proxy):
             generate_vcenter_configuration(node),
         )
     )
+    vendordata.update(generated_data)
+    return vendordata
+
+
+def load_local_data():
+    """Load user defined cloud-init vendor data file from /etc/maas/vendordata.yaml"""
+    filepath = '/etc/maas/vendordata.yaml'
+    useryaml = {}
+    if path.exists(filepath):
+        try:
+            with open(file=filepath, mode='r') as filecontents:
+                useryaml = yaml.safe_load(filecontents)
+        except Exception:
+            logger.error(
+                "Invalid vendor data yaml %s" % filepath
+            )
+    return useryaml
 
 
 def generate_system_info(node):