Juju Charms Collection
lxd package

Merge lp:~zulcss/charms/trusty/lxd/lxd-filesystem into lp:~openstack-charmers-archive/charms/trusty/lxd/next

  1. Trusty Tahr (14.04)
  2. lxd-filesystem
  3. Merge into next
Proposed by Chuck Short
Status: Merged
Merged at revision: 53
Proposed branch: lp:~zulcss/charms/trusty/lxd/lxd-filesystem
Merge into: lp:~openstack-charmers-archive/charms/trusty/lxd/next
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/lxd_utils.py (+1/-1)
To merge this branch: bzr merge lp:~zulcss/charms/trusty/lxd/lxd-filesystem
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+286701@code.launchpad.net

Description of the change

Fix filesystem check before mounting /var/lib/lxd

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #927 lxd-next for zulcss mp286701
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/927/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #828 lxd-next for zulcss mp286701
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/
Build: http://10.245.162.36:8080/job/charm_unit_test/828/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #373 lxd-next for zulcss mp286701
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/373/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/lxd_utils.py'
2--- hooks/lxd_utils.py 2015-10-20 10:13:31 +0000
3+++ hooks/lxd_utils.py 2016-02-19 18:36:23 +0000
4@@ -216,7 +216,7 @@
5
6
7 def filesystem_mounted(fs):
8- return call(['grep', '-wqs', fs, '/proc/mounts']) == 0
9+ return fs in [f for f, m in mounts()]
10
11
12 def lxd_trust_password():

Subscribers

People subscribed via source and target branches