populate /var/lib/waagent with ovf-env.xml

this will copy the ovf-env.xml file that was found to
the configured directory (default /var/lib/waagent)

2 files changed, 39 insertions, 12 deletions

diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
index 5037c1a3..f1c7c771 100644
--- a/cloudinit/sources/DataSourceAzure.py
+++ b/cloudinit/sources/DataSourceAzure.py
@@ -30,7 +30,9 @@ LOG = logging.getLogger(__name__)
 DS_NAME = 'Azure'
 DEFAULT_METADATA = {"instance-id": "iid-AZURE-NODE"}
 AGENT_START = ['service', 'walinuxagent', 'start']
-BUILTIN_DS_CONFIG = {'datasource': {DS_NAME: {'agent_command': AGENT_START}}}
+BUILTIN_DS_CONFIG = {'datasource': {DS_NAME: {
+     'agent_command': AGENT_START,
+     'data_dir': "/var/lib/waagent"}}}
 
 
 class DataSourceAzureNet(sources.DataSource):
@@ -64,7 +66,7 @@ class DataSourceAzureNet(sources.DataSource):
                 LOG.warn("%s was not mountable" % cdev)
                 continue
 
-            (md, self.userdata_raw, cfg) = ret
+            (md, self.userdata_raw, cfg, files) = ret
             self.seed = cdev
             self.metadata = util.mergemanydict([md, DEFAULT_METADATA])
             self.cfg = cfg
@@ -76,18 +78,24 @@ class DataSourceAzureNet(sources.DataSource):
         if not found:
             return False
 
-        path = ['datasource', DS_NAME, 'agent_command']
-        cmd = None
+        fields = [('cmd', ['datasource', DS_NAME, 'agent_command']),
+                  ('datadir', ['datasource', DS_NAME, 'data_dir'])]
+        mycfg = {}
         for cfg in (self.cfg, self.sys_cfg, BUILTIN_DS_CONFIG):
-            cmd = util.get_cfg_by_path(cfg, keyp=path)
-            if cmd is not None:
-                break
+            for name, path in fields:
+                if name in mycfg:
+                    continue
+                value = util.get_cfg_by_path(cfg, keyp=path)
+                if value is not None:
+                    mycfg[name] = value
+
+        write_files(mycfg['datadir'], files)
 
         try:
-            invoke_agent(cmd)
+            invoke_agent(mycfg['cmd'])
         except util.ProcessExecutionError:
             # claim the datasource even if the command failed
-            util.logexc(LOG, "agent command '%s' failed.", cmd)
+            util.logexc(LOG, "agent command '%s' failed.", mycfg['cmd'])
 
         return True
 
@@ -95,6 +103,16 @@ class DataSourceAzureNet(sources.DataSource):
         return self.cfg
 
 
+def write_files(datadir, files):
+    if not datadir:
+        return
+    if not files:
+        files = {}
+    for (name, content) in files.items():
+        util.write_file(filename=os.path.join(datadir, name),
+                        content=content, mode=0600)
+
+
 def invoke_agent(cmd):
     # this is a function itself to simplify patching it for test
     if cmd:
@@ -114,7 +132,7 @@ def find_child(node, filter_func):
     return ret
 
 
-def load_azure_ovf_pubkeys(sshnode):
+def load_azure_ovf_pubkeys(_sshnode):
     # in the future this would return a list of dicts like:
     #  [{'fp': '6BE7A7C3C8A8F4B123CCA5D0C2F1BE4CA7B63ED7',
     #    'path': 'where/to/go'}]
@@ -186,7 +204,7 @@ def read_azure_ovf(contents):
         elif name == "dscfg":
             cfg['datasource'] = {DS_NAME: util.load_yaml(value, default={})}
         elif name == "ssh":
-            cfg['_pubkeys'] = loadAzurePubkeys(child)
+            cfg['_pubkeys'] = load_azure_ovf_pubkeys(child)
         elif name == "disablesshpasswordauthentication":
             cfg['ssh_pwauth'] = util.is_true(value)
         elif simple:
@@ -230,7 +248,8 @@ def load_azure_ds_dir(source_dir):
     with open(ovf_file, "r") as fp:
         contents = fp.read()
 
-    return read_azure_ovf(contents)
+    md, ud, cfg = read_azure_ovf(contents)
+    return (md, ud, cfg, {'ovf-env.xml': contents})
 
 
 class BrokenAzureDataSource(Exception):
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py
index a2347f1b..68f4bcca 100644
--- a/tests/unittests/test_datasource/test_azure.py
+++ b/tests/unittests/test_datasource/test_azure.py
@@ -83,6 +83,12 @@ class TestAzureDataSource(MockerTestCase):
         def invoker(cmd):
             data['agent_invoked'] = cmd
 
+        def file_writer(datadir, files):
+            data['files'] = {}
+            data['datadir'] = datadir
+            for (fname, content) in files.items():
+                data['files'][fname] = content
+
         if data.get('ovfcontent') is not None:
             populate_dir(os.path.join(self.paths.seed_dir, "azure"),
                          {'ovf-env.xml': data['ovfcontent']})
@@ -93,6 +99,7 @@ class TestAzureDataSource(MockerTestCase):
             self.apply_patches([(mod, 'list_possible_azure_ds_devs', dsdevs)])
 
         self.apply_patches([(mod, 'invoke_agent', invoker)])
+        self.apply_patches([(mod, 'write_files', file_writer)])
 
         dsrc = mod.DataSourceAzureNet(
             data.get('sys_cfg', {}), distro=None, paths=self.paths)
@@ -109,6 +116,7 @@ class TestAzureDataSource(MockerTestCase):
         self.assertTrue(ret)
         self.assertEqual(dsrc.userdata_raw, "")
         self.assertEqual(dsrc.metadata['local-hostname'], odata['HostName'])
+        self.assertTrue('ovf-env.xml' in data['files'])
 
     def test_user_cfg_set_agent_command(self):
         cfg = {'agent_command': "my_command"}