Juju Charms Collection
ceph package

Merge lp:~james-page/charms/trusty/ceph/lp1535315 into lp:~openstack-charmers-archive/charms/trusty/ceph/next

  1. Trusty Tahr (14.04)
  2. lp1535315
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 136
Proposed branch: lp:~james-page/charms/trusty/ceph/lp1535315
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 32 lines (+6/-0)
3 files modified
config.yaml (+4/-0)
hooks/ceph_hooks.py (+1/-0)
templates/ceph.conf (+1/-0)
To merge this branch: bzr merge lp:~james-page/charms/trusty/ceph/lp1535315
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+282975@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #16421 ceph-next for james-page mp282975
    UNIT OK: passed

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

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

charm_lint_check #17576 ceph-next for james-page mp282975
    LINT OK: passed

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

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

charm_amulet_test #8882 ceph-next for james-page mp282975
    AMULET OK: passed

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

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

Can we confirm that setting dio to false doesn't break block devices for journals?

lp:~james-page/charms/trusty/ceph/lp1535315 updated
130. By James Page

rebase

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

charm_lint_check #18393 ceph-next for james-page mp282975
    LINT OK: passed

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

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

charm_unit_test #17136 ceph-next for james-page mp282975
    UNIT OK: passed

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

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

charm_amulet_test #9103 ceph-next for james-page mp282975
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2016-01-13 12:45:54 +0000
3+++ config.yaml 2016-01-30 14:45:28 +0000
4@@ -187,3 +187,7 @@
5 description: |
6 A comma-separated list of nagios servicegroups.
7 If left empty, the nagios_context will be used as the servicegroup
8+ use-direct-io:
9+ default: True
10+ type: boolean
11+ description: Configure use of direct IO for OSD journals.
12
13=== modified file 'hooks/ceph_hooks.py'
14--- hooks/ceph_hooks.py 2016-01-22 15:37:01 +0000
15+++ hooks/ceph_hooks.py 2016-01-30 14:45:28 +0000
16@@ -100,6 +100,7 @@
17 'ceph_public_network': config('ceph-public-network'),
18 'ceph_cluster_network': config('ceph-cluster-network'),
19 'loglevel': config('loglevel'),
20+ 'dio': str(config('use-direct-io')).lower(),
21 }
22
23 if config('prefer-ipv6'):
24
25=== modified file 'templates/ceph.conf'
26--- templates/ceph.conf 2016-01-13 12:45:54 +0000
27+++ templates/ceph.conf 2016-01-30 14:45:28 +0000
28@@ -41,4 +41,5 @@
29 keyring = /var/lib/ceph/osd/$cluster-$id/keyring
30 osd journal size = {{ osd_journal_size }}
31 filestore xattr use omap = true
32+journal dio = {{ dio }}
33

Subscribers

People subscribed via source and target branches