ols-vms

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

  1. lxd-privileged
  2. Merge into trunk
Proposed by Ricardo Kirkner
Status: Needs review
Proposed branch: lp:~ricardokirkner/ols-vms/lxd-privileged
Merge into: lp:ols-vms
Diff against target: 55 lines (+20/-0)
2 files modified
olsvms/tests/test_lxd.py (+16/-0)
olsvms/vms/lxd.py (+4/-0)
To merge this branch: bzr merge lp:~ricardokirkner/ols-vms/lxd-privileged
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+328854@code.launchpad.net

Commit message

support configuring container as privileged

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) wrote :

+1

review: Approve
Reply

Unmerged revisions

303. By Ricardo Kirkner

support configuring container as privileged

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'olsvms/tests/test_lxd.py'
2--- olsvms/tests/test_lxd.py 2017-03-15 16:25:51 +0000
3+++ olsvms/tests/test_lxd.py 2017-08-10 15:36:40 +0000
4@@ -203,6 +203,11 @@
5 self.assertEqual(0, ret)
6 self.assertEqual('\n', out)
7 self.assertEqual('', err)
8+ # By default, privileged is not set
9+ ret, out, err = lxd_config_get(self.vm_name, 'security.privileged')
10+ self.assertEqual(0, ret)
11+ self.assertEqual('\n', out)
12+ self.assertEqual('', err)
13
14 @features.requires(vms_features.lxd_nesting_1)
15 def test_nesting(self):
16@@ -216,6 +221,17 @@
17 self.assertEqual('True\n', out)
18 self.assertEqual('', err)
19
20+ def test_privileged(self):
21+ vm = lxd.Lxd(config.VmStack(self.vm_name))
22+ vm.conf.set('lxd.privileged', 'True')
23+ self.addCleanup(vm.teardown)
24+ self.addCleanup(vm.stop)
25+ vm.setup()
26+ ret, out, err = lxd_config_get(self.vm_name, 'security.privileged')
27+ self.assertEqual(0, ret)
28+ self.assertEqual('True\n', out)
29+ self.assertEqual('', err)
30+
31 def test_absolute_user_mounts(self):
32 vm = lxd.Lxd(config.VmStack(self.vm_name))
33 os.mkdir('testing')
34
35=== modified file 'olsvms/vms/lxd.py'
36--- olsvms/vms/lxd.py 2017-02-13 16:43:25 +0000
37+++ olsvms/vms/lxd.py 2017-08-10 15:36:40 +0000
38@@ -141,6 +141,7 @@
39 for p in profiles:
40 init_command.extend(['-p', p])
41 nesting = self.conf.get('lxd.nesting')
42+ privileged = self.conf.get('lxd.privileged')
43 if not check_nesting(nesting):
44 raise errors.OlsVmsError(
45 'Lxd needs more ids for {} levels of nesting'.format(nesting))
46@@ -149,6 +150,9 @@
47 if nesting:
48 init_command.extend(['--config',
49 'security.nesting=True'])
50+ if privileged:
51+ init_command.extend(['--config',
52+ 'security.privileged=True'])
53 # FIXME: Log out & err ? -- vila 2016-01-05
54 # FIXME: This can hang IRL (apparently when a new image needs to be
55 # downloaded requiring an lxd restart, but this cannot be reliably

Subscribers

People subscribed via source and target branches