canonical · smoser · Apr 13, 2021 · Mar 1, 2021 · Mar 1, 2021 · Mar 1, 2021
diff --git a/cloudinit/sources/DataSourceVultr.py b/cloudinit/sources/DataSourceVultr.py
@@ -52,26 +52,40 @@ def _get_data(self):
         # Fetch metadata
         md = self.get_metadata()
 
-        config = vultr.generate_config(md)
+        self.metadata_full = md
+        self.metadata['instanceid'] = md['instanceid']
+        self.metadata['local-hostname'] = md['hostname']
+        self.metadata['public-keys'] = md["public-keys"]
+        self.userdata_raw = md["user-data"]
 
-        # This requires info generated in the vendor config
-        script = md['startup-script']
-        user_scripts = []
-        user_scripts = vultr.generate_user_scripts(script, config)
+        # Generate config and process data
+        config = self.get_datasource_data(md)
 
-        # Dump vendor config so diagnosing failures is manageable
+        # Dump some data so diagnosing failures is manageable
         LOG.debug("Vultr Vendor Config:")
         LOG.debug(json.dumps(config))
+        LOG.debug("SUBID: %s", self.metadata['instanceid'])
+        LOG.debug("Hostname: %s", self.metadata['local-hostname'])
+        if self.userdata_raw is not None:
+            LOG.debug("User-Data:")
+            LOG.debug(self.userdata_raw)
 
-        self.metadata_full = md
-        self.metadata['instanceid'] = self.metadata_full['instanceid']
-        self.metadata['local-hostname'] = self.metadata_full['hostname']
+        return True
+
+    # Process metadata
+    def get_datasource_data(self, md):
+        # Grab config
+        config = vultr.generate_config(md)
+
+        # This requires info generated in the vendor config
+        user_scripts = []
+        user_scripts = vultr.generate_user_scripts(md, config)
 
         # Default hostname is "vultr"
         if self.metadata['local-hostname'] == "":
             self.metadata['local-hostname'] = "vultr"
 
-        self.metadata['public-keys'] = md["public-keys"].splitlines()
+        self.metadata['public-keys'] = md["public-keys"]
         self.userdata_raw = md["user-data"]
         if self.userdata_raw == "":
             self.userdata_raw = None
@@ -81,14 +95,7 @@ def _get_data(self):
             self.vendordata_raw.append(uscript)
         self.vendordata_raw.append("#cloud-config\n%s" % json.dumps(config))
 
-        # Dump some data so diagnosing failures is manageable
-        LOG.debug("SUBID: %s", self.metadata['instanceid'])
-        LOG.debug("Hostname: %s", self.metadata['local-hostname'])
-        if self.userdata_raw is not None:
-            LOG.debug("User-Data:")
-            LOG.debug(self.userdata_raw)
-
-        return True
+        return config
 
     # Get the metadata by flag
     def get_metadata(self):
@@ -116,7 +123,7 @@ def launch_index(self):
 
     @property
     def network_config(self):
-        md = self.get_metadata()
+        md = self.metadata_full['interfaces']
         config = vultr.generate_network_config(md)
 
         return config

diff --git a/cloudinit/sources/helpers/vultr.py b/cloudinit/sources/helpers/vultr.py
@@ -32,7 +32,8 @@ def get_metadata(url, timeout, retries, sec_between):
     metadata = v1_json
 
     # This comes through as a string but is JSON, make a dict
-    metadata['vendor-config'] = json.loads(metadata['vendor-config'])
+    raw = metadata['vendor-data']['config']
+    metadata['vendor-data']['config'] = json.loads(raw)
 
     return metadata
 
@@ -61,7 +62,7 @@ def is_vultr():
         return True
 
     # Baremetal requires a kernel parameter
-    if "vultr" in util.get_cmdline():
+    if "vultr" in util.get_cmdline().split():
         return True
 
     return False
@@ -113,15 +114,13 @@ def generate_network_config(md):
         ]
     }
 
-    intf = md['interfaces']
-
     # Prepare interface 0, public
-    if len(intf) > 0:
-        network['config'].append(generate_public_network_interface(intf))
+    if len(md) > 0:
+        network['config'].append(generate_public_network_interface(md))
 
     # Prepare interface 1, private
-    if len(intf) > 1:
-        network['config'].append(generate_private_network_interface(intf))
+    if len(md) > 1:
+        network['config'].append(generate_private_network_interface(md))
 
     return network
 
@@ -210,43 +209,48 @@ def generate_private_network_interface(interfaces):
 # images are deployed on Vultr before Cloud-Init
 def generate_config(md):
     # Create vendor config
-    config_template = copy.deepcopy(md['vendor-config'])
+    config_template = copy.deepcopy(md['vendor-data']['config'])
 
     # Add generated network parts
-    config_template['network'] = generate_network_config(md)
-
-    # Linux specific packages
-    if util.is_Linux():
-        config_template['packages'].append("ethtool")
+    config_template['network'] = generate_network_config(md['interfaces'])
 
     return config_template
 
 
 # This is for the vendor and startup scripts
-def generate_user_scripts(script, vendor_config):
-    # Define vendor script
-    vendor_script = "#!/bin/bash"
-
-    # Go through the interfaces
-    for netcfg in vendor_config['network']['config']:
-        # If the interface has a mac and is physical
-        if "mac_address" in netcfg and netcfg['type'] == "physical":
-            # Enable multi-queue on linux
-            # This is executed as a vendor script
-            if util.is_Linux():
+def generate_user_scripts(md, vendor_config):
+    user_scripts = []
+
+    # Raid 1 script
+    if md['vendor-data']['raid1-script']:
+        user_scripts.append(md['vendor-data']['raid1-script'])
+
+    # Enable multi-queue on linux
+    if util.is_Linux() and md['vendor-data']['ethtool-script']:
+        ethtool_script = md['vendor-data']['ethtool-script']
+
+        # Tool location
+        tool = "/opt/vultr/ethtool"
+
+        # Go through the interfaces
+        for netcfg in vendor_config['network']['config']:
+            # If the interface has a mac and is physical
+            if "mac_address" in netcfg and netcfg['type'] == "physical":
                 # Set its multi-queue to num of cores as per RHEL Docs
                 name = netcfg['name']
-                command = "ethtool -L %s combined $(nproc --all)" % name
-                vendor_script = '%s\n%s' % (vendor_script, command)
+                command = "%s -L %s combined $(nproc --all)" % (tool, name)
+                ethtool_script = '%s\n%s' % (ethtool_script, command)
 
-    vendor_script = '%s\n' % vendor_script
+        user_scripts.append(ethtool_script)
 
-    # Vendor script and start the array
-    user_scripts = [vendor_script]
+    # This is for vendor scripts
+    if md['vendor-data']['vendor-script']:
+        user_scripts.append(md['vendor-data']['vendor-script'])
 
     # Startup script
+    script = md['startup-script']
     if script and script != "echo No configured startup script":
-        user_scripts.append("%s\n" % script)
+        user_scripts.append(script)
 
     return user_scripts
 

diff --git a/tests/unittests/test_datasource/test_vultr.py b/tests/unittests/test_datasource/test_vultr.py
@@ -9,19 +9,11 @@
 
 from cloudinit import helpers
 from cloudinit import settings
-from cloudinit import util
 from cloudinit.sources import DataSourceVultr
 from cloudinit.sources.helpers import vultr
 
 from cloudinit.tests.helpers import mock, CiTestCase
 
-# Large data
-SCRIPT1 = 'IyEvYmluL2Jhc2gKZXRodG9vbCAtTCBldGgwIGNvbWJp' \
-          'bmVkICQobnByb2MgLS1hbGwpCg=='
-SCRIPT2 = 'IyEvYmluL2Jhc2gKZXRodG9vbCAtTCBldGgwIGNvbWJp' \
-          'bmVkICQobnByb2MgLS1hbGwpCmV0aHRvb2wgLUwgZXRo' \
-          'MSBjb21iaW5lZCAkKG5wcm9jIC0tYWxsKQo='
-
 # Vultr metadata test data
 VULTR_V1_1 = {
     'bgp': {
@@ -60,29 +52,35 @@
             'network-type': 'public'
         }
     ],
-    'public-keys': 'ssh-rsa AAAAB3NzaC1y...IQQhv5PAOKaIl+mM3c= test3@key\n',
+    'public-keys': [
+        'ssh-rsa AAAAB3NzaC1y...IQQhv5PAOKaIl+mM3c= test3@key'
+    ],
     'region': {
         'regioncode': 'EWR'
     },
     'user-defined': [
     ],
     'startup-script': 'echo No configured startup script',
+    'raid1-script': '',
     'user-data': [
     ],
-    'vendor-config': {
-        'package_upgrade': 'true',
-        'disable_root': 0,
-        'packages': [],
-        'ssh_pwauth': 1,
-        'chpasswd': {
-            'expire': False,
-            'list': [
-                'root:$6$S2Smuj.../VqxmIR9Urw0jPZ88i4yvB/'
-            ]
-        },
-        'system_info': {
-            'default_user': {
-                'name': 'root'
+    'vendor-data': {
+        'vendor-script': '',
+        'ethtool-script': '',
+        'config': {
+            'package_upgrade': 'true',
+            'disable_root': 0,
+            'ssh_pwauth': 1,
+            'chpasswd': {
+                'expire': False,
+                'list': [
+                    'root:$6$S2Smuj.../VqxmIR9Urw0jPZ88i4yvB/'
+                ]
+            },
+            'system_info': {
+                'default_user': {
+                    'name': 'root'
+                }
             }
         }
     }
@@ -145,7 +143,9 @@
             'networkid':'net5e7155329d730'
         }
     ],
-    'public-keys': 'ssh-rsa AAAAB3NzaC1y...IQQhv5PAOKaIl+mM3c= test3@key\n',
+    'public-keys': [
+        'ssh-rsa AAAAB3NzaC1y...IQQhv5PAOKaIl+mM3c= test3@key'
+    ],
     'region': {
         'regioncode': 'EWR'
     },
@@ -154,20 +154,25 @@
     'startup-script': 'echo No configured startup script',
     'user-data': [
     ],
-    'vendor-config': {
-        'package_upgrade': 'true',
-        'disable_root': 0,
-        'packages': [],
-        'ssh_pwauth': 1,
-        'chpasswd': {
-            'expire': False,
-            'list': [
-                'root:$6$SxXx...k2mJNIzZB5vMCDBlYT1'
-            ]
-        },
-        'system_info': {
-            'default_user': {
-                'name': 'root'
+
+    'vendor-data': {
+        'vendor-script': '',
+        'ethtool-script': '',
+        'raid1-script': '',
+        'config': {
+            'package_upgrade': 'true',
+            'disable_root': 0,
+            'ssh_pwauth': 1,
+            'chpasswd': {
+                'expire': False,
+                'list': [
+                    'root:$6$SxXx...k2mJNIzZB5vMCDBlYT1'
+                ]
+            },
+            'system_info': {
+                'default_user': {
+                    'name': 'root'
+                }
             }
         }
     }
@@ -183,9 +188,6 @@
 EXPECTED_VULTR_CONFIG_1 = {
     'package_upgrade': 'true',
     'disable_root': 0,
-    'packages': [
-        'ethtool'
-    ],
     'ssh_pwauth': 1,
     'chpasswd': {
         'expire': False,
@@ -222,9 +224,6 @@
 EXPECTED_VULTR_CONFIG_2 = {
     'package_upgrade': 'true',
     'disable_root': 0,
-    'packages': [
-        'ethtool'
-    ],
     'ssh_pwauth': 1,
     'chpasswd': {
         'expire': False,
@@ -371,18 +370,12 @@ def test_datasource(self,
         orig_val = self.maxDiff
         self.maxDiff = None
 
-        expected_script = util.b64d(SCRIPT2)
         vendordata = source.vendordata_raw
 
-        # Test vendor script
-        self.assertEqual(
-            expected_script,
-            vendordata[0])
-
         # Test vendor config
         self.assertEqual(
             EXPECTED_VULTR_CONFIG_2,
-            json.loads(vendordata[1].replace("#cloud-config", "")))
+            json.loads(vendordata[0].replace("#cloud-config", "")))
 
         self.maxDiff = orig_val
 
@@ -417,16 +410,18 @@ def test_get_data_2(self, mock_netmap):
     @mock.patch('cloudinit.net.get_interfaces_by_mac')
     def test_network_config(self, mock_netmap):
         mock_netmap.return_value = INTERFACE_MAP
+        interf = VULTR_V1_1['interfaces']
 
         self.assertEqual(EXPECTED_VULTR_NETWORK_1,
-                         vultr.generate_network_config(VULTR_V1_1))
+                         vultr.generate_network_config(interf))
 
     # Test Private Networking config generation
     @mock.patch('cloudinit.net.get_interfaces_by_mac')
     def test_private_network_config(self, mock_netmap):
         mock_netmap.return_value = INTERFACE_MAP
+        interf = VULTR_V1_2['interfaces']
 
         self.assertEqual(EXPECTED_VULTR_NETWORK_2,
-                         vultr.generate_network_config(VULTR_V1_2))
+                         vultr.generate_network_config(interf))
 
 # vi: ts=4 expandtab