Merge lp:~ricardokirkner/ols-vms/lxd-privileged into lp:ols-vms

[Ricardo Kirkner]

support configuring container as privileged

[Adam Collard (adam-collard)]

+1

review: Approve

Unmerged revisions

303. By Ricardo Kirkner on 2017-08-10

support configuring container as privileged

=== modified file 'olsvms/tests/test_lxd.py'
--- olsvms/tests/test_lxd.py	2017-03-15 16:25:51 +0000
+++ olsvms/tests/test_lxd.py	2017-08-10 15:36:40 +0000
@@ -203,6 +203,11 @@
         self.assertEqual(0, ret)
         self.assertEqual('\n', out)
         self.assertEqual('', err)
+        # By default, privileged is not set
+        ret, out, err = lxd_config_get(self.vm_name, 'security.privileged')
+        self.assertEqual(0, ret)
+        self.assertEqual('\n', out)
+        self.assertEqual('', err)
 
     @features.requires(vms_features.lxd_nesting_1)
     def test_nesting(self):
@@ -216,6 +221,17 @@
         self.assertEqual('True\n', out)
         self.assertEqual('', err)
 
+    def test_privileged(self):
+        vm = lxd.Lxd(config.VmStack(self.vm_name))
+        vm.conf.set('lxd.privileged', 'True')
+        self.addCleanup(vm.teardown)
+        self.addCleanup(vm.stop)
+        vm.setup()
+        ret, out, err = lxd_config_get(self.vm_name, 'security.privileged')
+        self.assertEqual(0, ret)
+        self.assertEqual('True\n', out)
+        self.assertEqual('', err)
+
     def test_absolute_user_mounts(self):
         vm = lxd.Lxd(config.VmStack(self.vm_name))
         os.mkdir('testing')
 
=== modified file 'olsvms/vms/lxd.py'
--- olsvms/vms/lxd.py	2017-02-13 16:43:25 +0000
+++ olsvms/vms/lxd.py	2017-08-10 15:36:40 +0000
@@ -141,6 +141,7 @@
             for p in profiles:
                 init_command.extend(['-p', p])
         nesting = self.conf.get('lxd.nesting')
+        privileged = self.conf.get('lxd.privileged')
         if not check_nesting(nesting):
             raise errors.OlsVmsError(
                 'Lxd needs more ids for {} levels of nesting'.format(nesting))
@@ -149,6 +150,9 @@
         if nesting:
             init_command.extend(['--config',
                                  'security.nesting=True'])
+        if privileged:
+            init_command.extend(['--config',
+                                 'security.privileged=True'])
         # FIXME: Log out & err ? -- vila 2016-01-05
         # FIXME: This can hang IRL (apparently when a new image needs to be
         # downloaded requiring an lxd restart, but this cannot be reliably