From bd7aacc1105b7ae6f667047a17561fe2603c7178 Mon Sep 17 00:00:00 2001
From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Fri, 12 Apr 2019 19:51:28 +0000
Subject: [PATCH] libcloud: read userdata from config

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---
 teuthology/provision/cloud/openstack.py | 34 ++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/teuthology/provision/cloud/openstack.py b/teuthology/provision/cloud/openstack.py
index b8a564a54..bdfbbf279 100644
--- a/teuthology/provision/cloud/openstack.py
+++ b/teuthology/provision/cloud/openstack.py
@@ -129,6 +129,12 @@ class OpenStackProvider(Provider):
                 self._networks = list()
         return self._networks
 
+    @property
+    def default_userdata(self):
+        if not hasattr(self, '_default_userdata'):
+            self._default_userdata = self.conf.get('userdata', dict())
+        return self._default_userdata
+
     @property
     def security_groups(self):
         if not hasattr(self, '_security_groups'):
@@ -372,23 +378,33 @@ class OpenStackProvisioner(base.Provisioner):
 
     @property
     def userdata(self):
+        spec="{t}-{v}".format(t=self.os_type,
+                              v=self.os_version)
         base_config = dict(
-            user=self.user,
-            manage_etc_hosts=True,
-            hostname=self.hostname,
             packages=[
                 'git',
                 'wget',
                 'python',
                 'ntp',
             ],
-            runcmd=[
-                # Remove the user's password so that console logins are
-                # possible
-                ['passwd', '-d', self.user],
-                ['touch', self._sentinel_path]
-            ],
         )
+        runcmd=[
+            # Remove the user's password so that console logins are
+            # possible
+            ['passwd', '-d', self.user],
+            ['touch', self._sentinel_path]
+        ]
+        if spec in self.provider.default_userdata:
+            base_config = deepcopy(
+                    self.provider.default_userdata.get(spec, dict()))
+        base_config.update(user=self.user)
+        if 'manage_etc_hosts' not in base_config:
+            base_config.update(
+                manage_etc_hosts=True,
+                hostname=self.hostname,
+            )
+        base_config['runcmd'] = base_config.get('runcmd', list())
+        base_config['runcmd'].extend(runcmd)
         ssh_pubkey = util.get_user_ssh_pubkey()
         if ssh_pubkey:
             authorized_keys = base_config.get('ssh_authorized_keys', list())
-- 
2.47.3