diff --git a/.gitignore b/.gitignore
index f529536..7832492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ bin
 .tox
 *.sw[nop]
 *.pyc
+.idea
diff --git a/Makefile b/Makefile
index 42b6f4a..ef306df 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ PYTHON := /usr/bin/env python
 
 lint:
 	@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
-        hooks tests unit_tests
+        actions hooks tests unit_tests
 	@charm proof
 
 test:
diff --git a/actions.yaml b/actions.yaml
index 9cb421a..a93054b 100644
--- a/actions.yaml
+++ b/actions.yaml
@@ -2,3 +2,40 @@ pause-health:
   description: Pause ceph health operations across the entire ceph cluster
 resume-health:
   description: Resume ceph health operations across the entire ceph cluster
+create-cache-tier:
+  description: Create a new cache tier
+  params:
+    backer-pool:
+      type: string
+      description: |
+        The name of the pool that will back the cache tier. Also known as
+        the cold pool
+    cache-pool:
+      type: string
+      description: |
+        The name of the pool that will be the cache pool. Also known
+        as the hot pool
+    cache-mode:
+      type: string
+      default: writeback
+      enum: [writeback, readonly]
+      description: |
+        The mode of the caching tier.  Please refer to the Ceph docs for more
+        information
+  required: [backer-pool, cache-pool]
+  additionalProperties: false
+remove-cache-tier:
+  description: Remove an existing cache tier
+  params:
+    backer-pool:
+      type: string
+      description: |
+        The name of the pool that backs the cache tier. Also known as
+        the cold pool
+    cache-pool:
+      type: string
+      description: |
+        The name of the pool that is the cache pool. Also known
+        as the hot pool
+  required: [backer-pool, cache-pool]
+  additionalProperties: false
diff --git a/actions/__init__.py b/actions/__init__.py
new file mode 100644
index 0000000..9847ec9
--- /dev/null
+++ b/actions/__init__.py
@@ -0,0 +1 @@
+__author__ = 'chris'
diff --git a/actions/create-cache-tier b/actions/create-cache-tier
new file mode 120000
index 0000000..2a7e434
--- /dev/null
+++ b/actions/create-cache-tier
@@ -0,0 +1 @@
+create-cache-tier.py
\ No newline at end of file
diff --git a/actions/create-cache-tier.py b/actions/create-cache-tier.py
new file mode 100755
index 0000000..e8170cf
--- /dev/null
+++ b/actions/create-cache-tier.py
@@ -0,0 +1,41 @@
+#!/usr/bin/python
+__author__ = 'chris'
+from subprocess import CalledProcessError
+import sys
+
+sys.path.append('hooks')
+
+from charmhelpers.contrib.storage.linux.ceph import Pool, pool_exists
+from charmhelpers.core.hookenv import action_get, log, action_fail
+
+
+def make_cache_tier():
+    backer_pool = action_get("backer-pool")
+    cache_pool = action_get("cache-pool")
+    cache_mode = action_get("cache-mode")
+
+    # Pre flight checks
+    if not pool_exists('admin', backer_pool):
+        log("Please create {} pool before calling create-cache-tier".format(
+            backer_pool))
+        action_fail("create-cache-tier failed. Backer pool {} must exist "
+                    "before calling this".format(backer_pool))
+
+    if not pool_exists('admin', cache_pool):
+        log("Please create {} pool before calling create-cache-tier".format(
+            cache_pool))
+        action_fail("create-cache-tier failed. Cache pool {} must exist "
+                    "before calling this".format(cache_pool))
+
+    pool = Pool(service='admin', name=backer_pool)
+    try:
+        pool.add_cache_tier(cache_pool=cache_pool, mode=cache_mode)
+    except CalledProcessError as err:
+        log("Add cache tier failed with message: {}".format(
+            err.message))
+        action_fail("create-cache-tier failed.  Add cache tier failed with "
+                    "message: {}".format(err.message))
+
+
+if __name__ == '__main__':
+    make_cache_tier()
diff --git a/actions/remove-cache-tier b/actions/remove-cache-tier
new file mode 120000
index 0000000..136c0f0
--- /dev/null
+++ b/actions/remove-cache-tier
@@ -0,0 +1 @@
+remove-cache-tier.py
\ No newline at end of file
diff --git a/actions/remove-cache-tier.py b/actions/remove-cache-tier.py
new file mode 100755
index 0000000..79db9cf
--- /dev/null
+++ b/actions/remove-cache-tier.py
@@ -0,0 +1,41 @@
+#!/usr/bin/python
+from subprocess import CalledProcessError
+import sys
+
+sys.path.append('hooks')
+
+from charmhelpers.contrib.storage.linux.ceph import Pool, pool_exists
+from charmhelpers.core.hookenv import action_get, log, action_fail
+
+__author__ = 'chris'
+
+
+def delete_cache_tier():
+    backer_pool = action_get("backer-pool")
+    cache_pool = action_get("cache-pool")
+
+    # Pre flight checks
+    if not pool_exists('admin', backer_pool):
+        log("Backer pool {} must exist before calling this".format(
+            backer_pool))
+        action_fail("remove-cache-tier failed. Backer pool {} must exist "
+                    "before calling this".format(backer_pool))
+
+    if not pool_exists('admin', cache_pool):
+        log("Cache pool {} must exist before calling this".format(
+            cache_pool))
+        action_fail("remove-cache-tier failed. Cache pool {} must exist "
+                    "before calling this".format(cache_pool))
+
+    pool = Pool(service='admin', name=backer_pool)
+    try:
+        pool.remove_cache_tier(cache_pool=cache_pool)
+    except CalledProcessError as err:
+        log("Removing the cache tier failed with message: {}".format(
+            err.message))
+        action_fail("remove-cache-tier failed. Removing the cache tier failed "
+                    "with message: {}".format(err.message))
+
+
+if __name__ == '__main__':
+    delete_cache_tier()
diff --git a/hooks/charmhelpers/contrib/storage/linux/ceph.py b/hooks/charmhelpers/contrib/storage/linux/ceph.py
index fb1bee3..826bf82 100644
--- a/hooks/charmhelpers/contrib/storage/linux/ceph.py
+++ b/hooks/charmhelpers/contrib/storage/linux/ceph.py
@@ -163,7 +163,7 @@ class Pool(object):
         :return: None
         """
         # read-only is easy, writeback is much harder
-        mode = get_cache_mode(cache_pool)
+        mode = get_cache_mode(self.service, cache_pool)
         if mode == 'readonly':
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'cache-mode', cache_pool, 'none'])
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'remove', self.name, cache_pool])
@@ -171,7 +171,7 @@ class Pool(object):
         elif mode == 'writeback':
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'cache-mode', cache_pool, 'forward'])
             # Flush the cache and wait for it to return
-            check_call(['ceph', '--id', self.service, '-p', cache_pool, 'cache-flush-evict-all'])
+            check_call(['rados', '--id', self.service, '-p', cache_pool, 'cache-flush-evict-all'])
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'remove-overlay', self.name])
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'remove', self.name, cache_pool])
 
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 4825031..b8f21ee 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import amulet
+import re
 import time
 from charmhelpers.contrib.openstack.amulet.deployment import (
     OpenStackAmuletDeployment
@@ -9,7 +10,7 @@ from charmhelpers.contrib.openstack.amulet.utils import (  # noqa
     OpenStackAmuletUtils,
     DEBUG,
     # ERROR
-)
+    )
 
 # Use DEBUG to turn on debug logging
 u = OpenStackAmuletUtils(DEBUG)
@@ -457,6 +458,75 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
         if 'nodown' in output or 'noout' in output:
             amulet.raise_status(amulet.FAIL, msg="Still has noout,nodown")
 
+    @staticmethod
+    def find_pool(sentry_unit, pool_name):
+        """
+        This will do a ceph osd dump and search for pool you specify
+        :param sentry_unit: The unit to run this command from.
+        :param pool_name: str.  The name of the Ceph pool to query
+        :return: str or None.  The ceph pool or None if not found
+        """
+        output, dump_code = sentry_unit.run("ceph osd dump")
+        if dump_code is not 0:
+            amulet.raise_status(
+                amulet.FAIL,
+                msg="ceph osd dump failed with output: {}".format(
+                    output))
+        for line in output.split('\n'):
+            match = re.search(r"pool\s+\d+\s+'(?P<pool_name>.*)'", line)
+            if match:
+                name = match.group('pool_name')
+                if name == pool_name:
+                    return line
+        return None
+
+    def test_403_cache_tier_actions(self):
+        """Verify that cache tier add/remove works"""
+        u.log.debug("Testing cache tiering")
+
+        sentry_unit = self.ceph0_sentry
+        # Create our backer pool
+        output, code = sentry_unit.run("ceph osd pool create cold 128 128 ")
+        if code is not 0:
+            amulet.raise_status(
+                amulet.FAIL,
+                msg="ceph osd pool create cold failed with output: {}".format(
+                    output))
+
+        # Create our cache pool
+        output, code = sentry_unit.run("ceph osd pool create hot 128 128 ")
+        if code is not 0:
+            amulet.raise_status(
+                amulet.FAIL,
+                msg="ceph osd pool create hot failed with output: {}".format(
+                    output))
+
+        action_id = u.run_action(sentry_unit,
+                                 'create-cache-tier',
+                                 params={
+                                     'backer-pool': 'cold',
+                                     'cache-pool': 'hot',
+                                     'cache-mode': 'writeback'})
+        assert u.wait_on_action(action_id), \
+            "Create cache tier action failed."
+
+        pool_line = self.find_pool(
+            sentry_unit=sentry_unit,
+            pool_name='hot')
+
+        assert "cache_mode writeback" in pool_line, \
+            "cache_mode writeback not found in cache pool"
+        remove_action_id = u.run_action(sentry_unit,
+                                        'remove-cache-tier',
+                                        params={
+                                            'backer-pool': 'cold',
+                                            'cache-pool': 'hot'})
+        assert u.wait_on_action(remove_action_id), \
+            "Remove cache tier action failed"
+        pool_line = self.find_pool(sentry_unit=sentry_unit, pool_name='hot')
+        assert "cache_mode" not in pool_line, \
+            "cache_mode is still enabled on cache pool"
+
     def test_410_ceph_cinder_vol_create(self):
         """Create and confirm a ceph-backed cinder volume, and inspect
         ceph cinder pool object count as the volume is created
@@ -592,5 +662,5 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
         if ret:
             amulet.raise_status(amulet.FAIL, msg=ret)
 
-    # FYI: No restart check as ceph services do not restart
-    # when charm config changes, unless monitor count increases.
+            # FYI: No restart check as ceph services do not restart
+            # when charm config changes, unless monitor count increases.
diff --git a/tests/charmhelpers/contrib/amulet/utils.py b/tests/charmhelpers/contrib/amulet/utils.py
index 2591a9b..a967b4f 100644
--- a/tests/charmhelpers/contrib/amulet/utils.py
+++ b/tests/charmhelpers/contrib/amulet/utils.py
@@ -781,16 +781,20 @@ class AmuletUtils(object):
         return '[{}-{}]'.format(uuid.uuid4(), time.time())
 
 # amulet juju action helpers:
-    def run_action(self, unit_sentry, action,
+    def run_action(self, unit_sentry, action, params=None,
                    _check_output=subprocess.check_output):
         """Run the named action on a given unit sentry.
 
+        params a dict of parameters to use
         _check_output parameter is used for dependency injection.
 
         @return action_id.
         """
         unit_id = unit_sentry.info["unit_name"]
         command = ["juju", "action", "do", "--format=json", unit_id, action]
+        if params is not None:
+            for key, value in params.iteritems():
+                command.append("{}={}".format(key, value))
         self.log.info("Running command: %s\n" % " ".join(command))
         output = _check_output(command, universal_newlines=True)
         data = json.loads(output)
diff --git a/tox.ini b/tox.ini
index d0c290f..838990c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ deps = -r{toxinidir}/requirements.txt
 basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = flake8 {posargs} hooks unit_tests tests
+commands = flake8 {posargs} actions hooks unit_tests tests
            charm proof
 
 [testenv:venv]