Squashed commit of the following:

commit 9b832d9391f9fea2d1491d01da6101585930fc75
Merge: e2432c4f 7b36210
Author: Chris MacNaughton <chmacnaughton@gmail.com>
Date:   Mon Mar 21 16:40:54 2016 -0400

    Merge branch 'master' of github.com:openstack/charm-ceph into charm-ceph-mon

    Change-Id: I42cfe6f1e5887627981f8ce4beff164803cc3957

commit 7b36210bac5bef3bacae2614995e123ef926453f
Author: Chris Holcombe <xfactor973@gmail.com>
Date:   Fri Mar 18 15:37:06 2016 -0700

    Add ceph-osd to ceph

    This change adds ceph-osd back into ceph for amulet testing.

    Change-Id: Ice4aaf7739e8c839189313d3f6175a834cf64219

commit e87e0b7bd22fe5ccae2aafcf6bd30f145405e01b
Author: Ryan Beisner <ryan.beisner@canonical.com>
Date:   Wed Mar 16 17:33:48 2016 +0000

    Update amulet test to include a non-existent osd-devices value

    The osd-devices charm config option is a whitelist, and the
    charm needs to gracefully handle items in that whitelist which
    may not exist.

    Change-Id: I5f9c6c1e4519fd671d6d36b415c9c8f763495dad

commit ffce15d52333de4063d04b808cfbca5d890fb996
Merge: fe8bf6e 9614896
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 16 17:45:25 2016 +0000

    Merge "Revert "Make 'blocked' status when node have no storage device""

commit 961489609d85851bd63c6825339a296bdf74e320
Author: Chris Holcombe <xfactor973@gmail.com>
Date:   Wed Mar 16 16:55:02 2016 +0000

    Revert "Make 'blocked' status when node have no storage device"

    This reverts commit fc04dd0fff33639b812627d04645134dd7d4d3de.

    Change-Id: I9efbf623fc9aa6096725a15e53df426739ac16ff

commit fe8bf6e4a5cb466a5efc6403c215e7aece2c6b9c
Author: Billy Olsen <billy.olsen@gmail.com>
Date:   Tue Mar 15 20:08:20 2016 -0700

    Use tox in Makefile targets

    Modify the Makefile to point at the appropriate tox targets
    so that tox and Make output can be equivalent. This involves
    mapping the lint target to the pep8 target and the test target
    to the py27 target.

    Change-Id: I99761d2fdf120bacff58d0aa5c2e584382c2e72b

commit fc04dd0fff33639b812627d04645134dd7d4d3de
Author: Seyeong Kim <seyeong.kim@canonical.com>
Date:   Fri Mar 11 06:07:52 2016 +0000

    Make 'blocked' status when node have no storage device

    Currently there is an msg for no storage status on
    ceph node. But it doesn't make this charm state
    'blocked'.

    is_storage_fine function has been created to check
    storage devices on ceph_hooks.py and using it on
    assess_status.

    Change-Id: I790fde0280060fa220ee83de2ad2319ac2c77230
    Closes-Bug: lp1424510

commit a7c5e85c408ab8446a18cc6761b1d0b292641ea7
Author: Ryan Beisner <ryan.beisner@canonical.com>
Date:   Fri Mar 4 14:36:38 2016 +0000

    Enable Xenial-Mitaka amulet test target.

    Change-Id: I0c386fc0c052cc1ac52c0a30f7a39fa914a61100

commit e80c5097c26ac4eb200a289daa272d5c7ac82539
Author: uoscibot <uosci-testing-bot@ubuntu.com>
Date:   Mon Feb 29 10:45:49 2016 +0000

    Adapt imports and metadata for github move

commit 391ed288fc763b69f0cd92459f236e7581a5f244
Merge: 78250bd 6228ea2
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Thu Feb 25 13:34:27 2016 -0500

    [hopem,r=]

    Support multiple l3 segments.
    Closes-Bug: 1523871

commit 6228ea2a8fa578c3c6b24b59f621e6e1026a7668
Merge: 6159390 78250bd
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Thu Feb 25 09:29:46 2016 -0500

    sync /next

commit 78250bd65c861adcb321f1c634def29fcfdaa8a9
Author: James Page <james.page@ubuntu.com>
Date:   Wed Feb 24 21:53:28 2016 +0000

    Add gitreview prior to migration to openstack

commit 61593905939359ba72768ccb8f1a450a571c1d24
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Wed Feb 24 15:56:20 2016 -0500

    only use fallback for get_public_addr() if networks not provided in config

commit 34841b0aea85b3d5693a5336dbf956a406414474
Merge: 08d1cbc 092368d
Author: James Page <james.page@ubuntu.com>
Date:   Wed Feb 24 14:22:20 2016 +0000

    Add actions to support configuration of erasure coded pools.

commit 092368d646d4e02b2d2ac08026b6cbf2c94a4042
Merge: de98010 08d1cbc
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Tue Feb 23 08:19:56 2016 -0800

    Merge upstream

commit 08d1cbcdc943493a556e0187d2b3e6fbe83b69e3
Merge: 2d4ff89 414e519
Author: James Page <james.page@ubuntu.com>
Date:   Tue Feb 23 09:49:50 2016 +0000

    Fix amulet tests for nova-compute changes.

commit 414e5195c939a99adcaf79e27eb057c07c7f4761
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Mon Feb 22 15:21:00 2016 -0500

    fix amulet

commit e99e991be21c6d98fc670bcafa30684c0ba4d5e0
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Mon Feb 22 12:56:00 2016 -0500

    fixup

commit de98010f6f8d81e63d47ac03d33aa40bd870c7ea
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Mon Feb 22 08:05:32 2016 -0800

    charmhelpers sync

commit 2d4ff89e4bba2e93e08a6dd00bc2367e90b708fe
Merge: f16e3fa f98627c
Author: Liam Young <liam.young@canonical.com>
Date:   Mon Feb 22 09:26:38 2016 +0000

    [james-page, r=gnuoy] Add configuration option for toggling use of direct io for OSD journals

commit f3803cb60d55154e35ac2294170b27fb348141b3
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Fri Feb 19 08:11:18 2016 -0800

    Change /usr/bin/python2.7 to /usr/bin/python

commit 612ba454c4263d9bfc672fe168a55c2f01599d70
Merge: c3d20a0 f16e3fa
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Thu Feb 18 17:16:55 2016 -0800

    Merge upstream and resolve conflicts with actions and actions.yaml

commit c3d20a0eb67918d11585851a7b5df55ce0290392
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Thu Feb 18 17:10:56 2016 -0800

    Fix up the niggles and provide feedback to the action user as to why something failed

commit ea5cc48ccbb5d6515703bd5c93c13b2147972cd1
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Thu Feb 18 17:42:05 2016 +0000

    more

commit f58dd864eac130a6bc20b46c1495d7fa34a54894
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Thu Feb 18 17:09:52 2016 +0000

    restore sanity

commit 32631ccde309040b92ba76ecc12b16bad953f486
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Thu Feb 18 11:40:09 2016 +0000

    post-review fixes

commit 7ada8f0de65d397648d041fae20ed21b3f38bd15
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Thu Feb 18 11:36:46 2016 +0000

    post-review fixes

commit f16e3fac5240133c1c7dfd406caacd21b364532a
Merge: a0ffb8b 7709b7d
Author: James Page <james.page@ubuntu.com>
Date:   Thu Feb 18 11:02:17 2016 +0000

    Add pause/resume cluster health actions

    Add actions to pause and resume cluster health monitoring within ceph for all osd devices.

    This will ensure that no rebalancing is done whilst maintenance actions are happening within the cluster.

commit a0ffb8bf97c9cf3c19d17090c96f2ea60c89da65
Merge: 65439ba 531b40d
Author: James Page <james.page@ubuntu.com>
Date:   Thu Feb 18 10:38:53 2016 +0000

    Wait for quorom and query the right unit remote_unit when not in radosgw context

commit 65439ba7dc3acf494c9a8d11e2cdd274d144b485
Merge: 5e77170 afd390b
Author: James Page <james.page@ubuntu.com>
Date:   Wed Feb 17 11:28:44 2016 +0000

    Update test target definitions;  Wait for unit status.

commit 531b40d9b2d216b467cca59d7649ab5bb4577b3d
Author: Liam Young <liam.young@canonical.com>
Date:   Wed Feb 17 10:15:37 2016 +0000

    Wait for quorom and query the right unit remote_unit when not in radosgw context

commit 5e77170f378be92a3e2e8de3c06dad158b4a14ca
Author: James Page <james.page@ubuntu.com>
Date:   Tue Feb 16 06:59:17 2016 +0000

    Tidy tox targets

commit 732d8e11cd5058e680a5982bce77648952c8532f
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Fri Feb 12 14:17:34 2016 -0800

    Used a list as an integer.  I meant to use the size of the list

commit afd390b3ed4212883a02ca971e5613246c3ae6a8
Author: Ryan Beisner <ryan.beisner@canonical.com>
Date:   Fri Feb 12 21:24:20 2016 +0000

    No need to not wait for nonexistent nrpe

commit 9721ce8006720d24b8e4133fbbb8a01d989a71c8
Author: Ryan Beisner <ryan.beisner@canonical.com>
Date:   Fri Feb 12 21:02:36 2016 +0000

    Disable Xenial test re: pending lp1537155

commit d12e2658f5b5e6c38b98ae986134f83df2e0a380
Author: Ryan Beisner <ryan.beisner@canonical.com>
Date:   Fri Feb 12 20:57:08 2016 +0000

    Update test target definitions;  Wait for unit status.

commit 7709b7d5385757fc6d8fe48fa7646efcdb77564a
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Feb 12 08:26:13 2016 -0500

    rename actions

commit 2c945523486227dd1c58a1c1a76a779d9c131a71
Merge: 5b5e6dca 27d5d4b
Author: James Page <james.page@ubuntu.com>
Date:   Fri Feb 12 12:34:20 2016 +0000

    Resolve symlinks in get_devices().

commit 7edce1dd489a4718a150f7f38ffd366855e49828
Author: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date:   Wed Feb 10 15:20:52 2016 +0000

    [hopem,r=]

    Support multiple l3 segments.
    Closes-Bug: 1523871

commit 27d5d4b8bb0fd61a3910dad1bdf46adc2b476649
Author: Bjorn Tillenius <bjorn@canonical.com>
Date:   Tue Feb 2 19:01:53 2016 +0200

    Lint.

commit 6980d3a3418ba512e65a79a62b140b238d54a17b
Author: Bjorn Tillenius <bjorn@canonical.com>
Date:   Tue Feb 2 17:34:19 2016 +0200

    Resolve symlinks in get_devices().

commit f98627c1c163d702ae1142a6153801073d57280c
Merge: 4f0dc6d 5b5e6dca
Author: James Page <james.page@ubuntu.com>
Date:   Sat Jan 30 15:45:01 2016 +0100

    rebase

commit eaa365a180e8eda88e6ef9f1a6c975a0b780dee5
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Fri Jan 22 15:21:45 2016 -0800

    Clean up another lint error

commit 477cdc96fbe124509995a02c358c24c64451c9e4
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Fri Jan 22 15:04:27 2016 -0800

    Patching up the other unit tests to passing status

commit faa7b3ad95ebed02718ff58b3e3203b7d59be709
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 16:42:58 2016 -0500

    remove regex

commit 1e3b2f5dd409a02399735aa2aeb5e78d18ea2240
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 16:10:15 2016 -0500

    lint fix

commit 620209aeb47900430f039eb2e65bfe00db672e32
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 16:05:15 2016 -0500

    use search instead of match

commit 2f47939fa84c43c485042325a925d72797df6480
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 15:16:22 2016 -0500

    fix line length

commit f203a5bdfc12a2a99e3695840f16182e037f1df1
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 15:02:10 2016 -0500

    modify regex to not care about order

commit 706b272fc91d432921750b3af09689361f4b8bb9
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 14:16:46 2016 -0500

    try with sleeping

commit 66d6952a65ceb5c8858f262daf127f96ed03ea81
Merge: e446a77 5b5e6dca
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Fri Jan 22 10:46:50 2016 -0800

    Merge upstream and resolve conflicts

commit fc714c96f40bac9fb89108cd56962343472f63cf
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 11:10:34 2016 -0500

    fix variable name

commit 8cb53237c6588a00d86dcc0a564d18eb7cd751ae
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 10:47:26 2016 -0500

    update to use correct(?) commands

commit b762e9842ca335845fe3a442dfdde838e5246b3b
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 22 08:01:03 2016 -0500

    update tests.yaml

commit e446a7731cbe377f30c88bb99083745ba95caa4e
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Thu Jan 21 14:19:53 2016 -0800

    Clean up lint warnings.  Also added a few more mock unit tests

commit 32ff93e8d0166b2346c422cbb9cd53bc4f805256
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Thu Jan 21 09:38:47 2016 -0800

    Adding a unit test file for ceph_ops

commit 4f0dc6d8b76b8545453293b2c69e2d6a164db10e
Author: James Page <james.page@ubuntu.com>
Date:   Mon Jan 18 16:39:49 2016 +0000

    Add configuration option for toggling use of direct io for OSD journals

commit 1977cdbde1d0fa7ad57baa07d97f477143d54787
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Mon Jan 18 08:07:35 2016 -0800

    Add actions to lint.  Change actions.yaml to use enum and also change underscores to dashes.  Log action_fail in addition to exiting -1.  Merge v2 requests with v1 requests since this does not break backwards compatibility.  Add unit tests.  Modify tox.ini to include actions.  .

commit 3f0e16bcc483952e340fa89505011b7a115ff421
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 15 16:45:00 2016 -0500

    fix version

commit c665092be6f9d07f45a0b9baf2e0f128e4ecdc37
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Fri Jan 15 16:20:27 2016 -0500

    updating tests

commit 80de4d7256efbbc6c2ab7cdfcb1ab292668be607
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Thu Jan 14 13:19:10 2016 -0500

    update readme

commit 44365d58785e9ba63179d092b875c2029024aa8b
Author: Chris MacNaughton <chris.macnaughton@canonical.com>
Date:   Thu Jan 14 13:17:19 2016 -0500

    add pause/resume actions

    pause calls:
    `ceph osd set noout
    ceoh osd set nodown`

    resume calls:
    `ceph osd unset noout
    ceph osd unset nodown`

commit bdd4e69e801e2178532e31216efe7e815b06f864
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Tue Dec 15 04:54:21 2015 -0800

    Missed a few typos

commit 0158586bde1a1f878c0a046a97510b8b90a95ce9
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Tue Dec 15 04:41:22 2015 -0800

    lint errors

commit 92ad78733279112bbba8e12d3fb19809ab9d0ff7
Author: Chris Holcombe <chris.holcombe@canonical.com>
Date:   Mon Dec 14 17:44:22 2015 -0800

    Actions are working and lightly tested.  Need to create a more robust, automated test setup

Change-Id: Ia18b19961dab66bb6c19ef7e9c421b2fec60fcc7