Merge lp:~corey.bryant/charms/trusty/quantum-gateway/mkdir755 into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

Proposed by Corey Bryant
Status: Merged
Merged at revision: 102
Proposed branch: lp:~corey.bryant/charms/trusty/quantum-gateway/mkdir755
Merge into: lp:~openstack-charmers/charms/trusty/quantum-gateway/next
Diff against target: 43 lines (+8/-8)
2 files modified
hooks/quantum_utils.py (+1/-1)
unit_tests/test_quantum_utils.py (+7/-7)
To merge this branch: bzr merge lp:~corey.bryant/charms/trusty/quantum-gateway/mkdir755
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+256652@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3566 quantum-gateway-next for corey.bryant mp256652
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3566/

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

charm_unit_test #3354 quantum-gateway-next for corey.bryant mp256652
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3354/

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

charm_amulet_test #3323 quantum-gateway-next for corey.bryant mp256652
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3323/

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/quantum_utils.py'
2--- hooks/quantum_utils.py 2015-04-14 00:48:21 +0000
3+++ hooks/quantum_utils.py 2015-04-17 12:17:06 +0000
4@@ -854,7 +854,7 @@
5 add_user_to_group('neutron', 'neutron')
6
7 for d in dirs:
8- mkdir(d, owner='neutron', group='neutron', perms=0700, force=False)
9+ mkdir(d, owner='neutron', group='neutron', perms=0755, force=False)
10
11 for l in logs:
12 write_file(l, '', owner='neutron', group='neutron', perms=0644)
13
14=== modified file 'unit_tests/test_quantum_utils.py'
15--- unit_tests/test_quantum_utils.py 2015-04-14 00:48:21 +0000
16+++ unit_tests/test_quantum_utils.py 2015-04-17 12:17:06 +0000
17@@ -723,19 +723,19 @@
18 add_user_to_group.assert_called_with('neutron', 'neutron')
19 expected = [
20 call('/etc/neutron', owner='neutron',
21- group='neutron', perms=0700, force=False),
22+ group='neutron', perms=0755, force=False),
23 call('/etc/neutron/rootwrap.d', owner='neutron',
24- group='neutron', perms=0700, force=False),
25+ group='neutron', perms=0755, force=False),
26 call('/etc/neutron/plugins', owner='neutron',
27- group='neutron', perms=0700, force=False),
28+ group='neutron', perms=0755, force=False),
29 call('/etc/nova', owner='neutron',
30- group='neutron', perms=0700, force=False),
31+ group='neutron', perms=0755, force=False),
32 call('/var/lib/neutron', owner='neutron',
33- group='neutron', perms=0700, force=False),
34+ group='neutron', perms=0755, force=False),
35 call('/var/lib/neutron/lock', owner='neutron',
36- group='neutron', perms=0700, force=False),
37+ group='neutron', perms=0755, force=False),
38 call('/var/log/neutron', owner='neutron',
39- group='neutron', perms=0700, force=False),
40+ group='neutron', perms=0755, force=False),
41 ]
42 self.assertEquals(mkdir.call_args_list, expected)
43 expected = [

Subscribers

People subscribed via source and target branches