diff --git a/contrib/splitup.yml b/contrib/splitup.yml
index deba58ee8..ecaa14835 100644
--- a/contrib/splitup.yml
+++ b/contrib/splitup.yml
@@ -28,6 +28,7 @@
       - ceph-restapi
       - ceph-agent
       - ceph-fetch-keys
+      - ceph-rbd-mirror
     basedir: "{{ lookup('pipe', 'git rev-parse --show-toplevel') }}"
 
   tasks:
diff --git a/group_vars/all.sample b/group_vars/all.sample
index 5ef576781..df9d3ea1d 100644
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -25,6 +25,7 @@ dummy:
 #rgw_group_name: rgws
 #mds_group_name: mdss
 #restapi_group_name: restapis
+#rbdmirror_group_name: rbdmirrors
 
 # If check_firewall is true, then ansible will try to determine if the
 # Ceph ports are blocked by a firewall. If the machine running ansible
@@ -216,7 +217,7 @@ dummy:
 #pool_default_pg_num: 128
 #pool_default_pgp_num: 128
 #pool_default_size: 3
-#pool_default_min_size: 1
+#pool_default_min_size: 0 # 0 means no specific default; ceph will use (pool_default_size)-(pool_default_size/2) so 2 if pool_default_size=3
 #public_network: 0.0.0.0/0
 #cluster_network: "{{ public_network }}"
 #osd_mkfs_type: xfs
diff --git a/group_vars/rbd-mirrors.sample b/group_vars/rbd-mirrors.sample
new file mode 100644
index 000000000..ad0f46f29
--- /dev/null
+++ b/group_vars/rbd-mirrors.sample
@@ -0,0 +1,37 @@
+---
+# Variables here are applicable to all host groups NOT roles
+
+# This sample file generated by generate_group_vars_sample.sh
+
+# Dummy variable to avoid error because ansible does not recognize the
+# file as a good configuration file when no variable in it.
+dummy:
+
+#########
+# SETUP #
+#########
+
+# NOTE (leseb): the rbd-mirror daemon needs a user to start
+# because it has to authenticate with the local cluster.
+# By default, using the admin user is fine, so you should not
+# need to change 'ceph_rbd_mirror_local_user' unless you have
+# a dedicated key available in /etc/ceph/.
+# Generally Ansible will use the admin key and put it
+# under /etc/ceph/. The same goes for 'ceph_rbd_mirror_remote_user'
+# there should not be any reason to change it.
+#ceph_rbd_mirror_local_user: admin
+#ceph_rbd_mirror_remote_user: admin
+
+# NOTE (leseb): the following variable needs the name of the remote cluster.
+# The name of this cluster must be different than your local cluster simply
+# because we need to have both keys and ceph.conf inside /etc/ceph.
+# Thus if cluster names are identical we can not have them under /etc/ceph
+#ceph_rbd_mirror_remote_cluster: ""
+
+#################
+# CONFIGURATION #
+#################
+
+#ceph_rbd_mirror_configure: false
+#ceph_rbd_mirror_pool: ""
+
diff --git a/purge-cluster.yml b/purge-cluster.yml
index 7fef66f9a..c2682455c 100644
--- a/purge-cluster.yml
+++ b/purge-cluster.yml
@@ -44,6 +44,7 @@
     mon_group_name: mons
     rgw_group_name: rgws
     mds_group_name: mdss
+    rbdmirror_group_name: rbdmirrors
 
 # When set to true both groups of packages are purged.
 # This can cause problem with qemu-kvm
@@ -157,6 +158,15 @@
       systemd_unit_files.stdout != "0" and
       rgw_group_name in group_names
 
+  - name: stop ceph rbd mirror with systemd
+    service:
+      name: ceph-rbd-mirror@admin.service
+      state: stopped
+    when:
+      ansible_os_family == 'RedHat' and
+      systemd_unit_files.stdout != "0" and
+      rbdmirror_group_name in group_names
+
 # before infernalis release, using sysvinit scripts
 # we use this test so we do not have to know which RPM contains the boot script
 # or where it is placed.
@@ -218,6 +228,13 @@
       ansible_distribution == 'Ubuntu' and
       rgw_group_name in group_names
 
+  - name: stop ceph rbd mirror on ubuntu
+    command: initctl stop ceph-rbd-mirorr cluster={{ cluster }} id=admin
+    failed_when: false
+    when:
+      ansible_distribution == 'Ubuntu' and
+      rbdmirror_group_name in group_names
+
   - name: check for anything running ceph
     shell: "ps awux | grep -v grep | grep -q -- ceph-"
     register: check_for_running_ceph
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index fef28e0d0..d5eabb51f 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -17,6 +17,7 @@ osd_group_name: osds
 rgw_group_name: rgws
 mds_group_name: mdss
 restapi_group_name: restapis
+rbdmirror_group_name: rbdmirrors
 
 # If check_firewall is true, then ansible will try to determine if the
 # Ceph ports are blocked by a firewall. If the machine running ansible
@@ -208,7 +209,7 @@ journal_size: 0
 pool_default_pg_num: 128
 pool_default_pgp_num: 128
 pool_default_size: 3
-pool_default_min_size: 1
+pool_default_min_size: 0 # 0 means no specific default; ceph will use (pool_default_size)-(pool_default_size/2) so 2 if pool_default_size=3
 public_network: 0.0.0.0/0
 cluster_network: "{{ public_network }}"
 osd_mkfs_type: xfs
diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index 5a346e75d..f4541ebfd 100644
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -36,6 +36,13 @@
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when: not ceph_stable_rh_storage
 
+# include Infernalis in the set of releases that do not have
+# a separate ceph-mon package or ceph-osd package
+# Note: Red Hat Ceph Storage is different, DOES separate them even in hammer
+
+- set_fact: > 
+    ceph_stable_rel_pkg="{{ ceph_stable_releases | union([ 'infernalis' ]) }}"
+
 - name: install distro or red hat storage ceph mon
   yum:
     name: "{{ item }}"
@@ -44,11 +51,10 @@
     - ceph
     - ceph-mon
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage) and
+    (ceph_origin == "distro" or ceph_stable_rh_storage or
+     (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
     mon_group_name in group_names and
-    ansible_pkg_mgr == "yum" and
-    ceph_stable and
-    ceph_stable_release not in ceph_stable_releases
+    ansible_pkg_mgr == "yum"
 
 - name: install distro or red hat storage ceph mon
   dnf:
@@ -58,11 +64,10 @@
     - ceph
     - ceph-mon
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage) and
+    (ceph_origin == "distro" or ceph_stable_rh_storage or
+     (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
     mon_group_name in group_names and
-    ansible_pkg_mgr == "dnf" and
-    ceph_stable and
-    ceph_stable_release not in ceph_stable_releases
+    ansible_pkg_mgr == "dnf"
 
 - name: install distro or red hat storage ceph osd
   yum:
@@ -72,11 +77,10 @@
     - ceph
     - ceph-osd
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage) and
+    (ceph_origin == "distro" or ceph_stable_rh_storage or
+     (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
     osd_group_name in group_names and
-    ansible_pkg_mgr == "yum" and
-    ceph_stable and
-    ceph_stable_release not in ceph_stable_releases
+    ansible_pkg_mgr == "yum"
 
 - name: install distro or red hat storage ceph osd
   dnf:
@@ -86,11 +90,10 @@
     - ceph
     - ceph-osd
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage) and
+    (ceph_origin == "distro" or ceph_stable_rh_storage or
+     (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
     osd_group_name in group_names and
-    ansible_pkg_mgr == "dnf" and
-    ceph_stable and
-    ceph_stable_release not in ceph_stable_releases
+    ansible_pkg_mgr == "dnf"
 
 - name: install ceph-test
   yum:
diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 2d223c807..fe91e03b6 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -212,6 +212,7 @@
   lineinfile:
     dest: /etc/sysconfig/ceph
     insertafter: EOF
+    create: yes
     line: "CLUSTER={{ cluster }}"
   when:
     ansible_os_family == "RedHat"
@@ -220,6 +221,7 @@
   lineinfile:
     dest: /etc/default/ceph/ceph
     insertafter: EOF
+    create: yes
     line: "CLUSTER={{ cluster }}"
   when:
     ansible_os_family == "Debian"
diff --git a/roles/ceph-mon/tasks/docker/create_configs.yml b/roles/ceph-mon/tasks/docker/create_configs.yml
index ff59a9a3c..29cbe12d8 100644
--- a/roles/ceph-mon/tasks/docker/create_configs.yml
+++ b/roles/ceph-mon/tasks/docker/create_configs.yml
@@ -8,7 +8,8 @@
       mode: 0644
 
 - name: generate ceph configuration file
-  config_template:
+  action: config_template
+  args:
     src: "{{ playbook_dir }}/roles/ceph-common/templates/ceph.conf.j2"
     dest: /etc/ceph/ceph.conf
     owner: "root"
diff --git a/roles/ceph-rbd-mirror/LICENSE b/roles/ceph-rbd-mirror/LICENSE
new file mode 100644
index 000000000..acee72b2b
--- /dev/null
+++ b/roles/ceph-rbd-mirror/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!) The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [2014] [Sébastien Han]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/roles/ceph-rbd-mirror/README.md b/roles/ceph-rbd-mirror/README.md
new file mode 100644
index 000000000..1aaccbffc
--- /dev/null
+++ b/roles/ceph-rbd-mirror/README.md
@@ -0,0 +1,41 @@
+# Ansible role: Ceph RBD mirror agent
+
+This role bootstraps the Ceph RBD mirror agent.
+
+# Requirements
+
+Nothing, it runs out of the box.
+
+# Role variables
+
+Have a look at: `defaults/main.yml`.
+
+## Mandatory variables
+
+None.
+
+# Dependencies
+
+The role `ceph.ceph-common` must be installed.
+
+# Example Playbook
+
+```
+- hosts: servers
+  remote_user: ubuntu
+  roles:
+     - { role: ceph.ceph-rbd-mirror }
+```
+
+# Contribution
+
+**THIS REPOSITORY DOES NOT ACCEPT PULL REQUESTS**
+**PULL REQUESTS MUST GO THROUGH [CEPH-ANSIBLE](https://github.com/ceph/ceph-ansible)**
+
+# License
+
+Apache
+
+# Author Information
+
+This role was created by S2bastien Han.
diff --git a/roles/ceph-rbd-mirror/defaults/main.yml b/roles/ceph-rbd-mirror/defaults/main.yml
new file mode 100644
index 000000000..12207b179
--- /dev/null
+++ b/roles/ceph-rbd-mirror/defaults/main.yml
@@ -0,0 +1,28 @@
+---
+#########
+# SETUP #
+#########
+
+# NOTE (leseb): the rbd-mirror daemon needs a user to start
+# because it has to authenticate with the local cluster.
+# By default, using the admin user is fine, so you should not
+# need to change 'ceph_rbd_mirror_local_user' unless you have
+# a dedicated key available in /etc/ceph/.
+# Generally Ansible will use the admin key and put it
+# under /etc/ceph/. The same goes for 'ceph_rbd_mirror_remote_user'
+# there should not be any reason to change it.
+ceph_rbd_mirror_local_user: admin
+ceph_rbd_mirror_remote_user: admin
+
+# NOTE (leseb): the following variable needs the name of the remote cluster.
+# The name of this cluster must be different than your local cluster simply
+# because we need to have both keys and ceph.conf inside /etc/ceph.
+# Thus if cluster names are identical we can not have them under /etc/ceph
+ceph_rbd_mirror_remote_cluster: ""
+
+#################
+# CONFIGURATION #
+#################
+
+ceph_rbd_mirror_configure: false
+ceph_rbd_mirror_pool: ""
diff --git a/roles/ceph-rbd-mirror/meta/main.yml b/roles/ceph-rbd-mirror/meta/main.yml
new file mode 100644
index 000000000..648af5aa6
--- /dev/null
+++ b/roles/ceph-rbd-mirror/meta/main.yml
@@ -0,0 +1,17 @@
+---
+galaxy_info:
+  author: Sébastien Han
+  description: Installs Ceph Mirror Agent
+  license: Apache
+  min_ansible_version: 1.7
+  platforms:
+    - name: Ubuntu
+      versions:
+        - trusty
+    - name: EL
+      versions:
+        - 7
+  categories:
+    - system
+dependencies:
+  - { role: ceph.ceph-common }
diff --git a/roles/ceph-rbd-mirror/tasks/configure_mirroring.yml b/roles/ceph-rbd-mirror/tasks/configure_mirroring.yml
new file mode 100644
index 000000000..66c32e19e
--- /dev/null
+++ b/roles/ceph-rbd-mirror/tasks/configure_mirroring.yml
@@ -0,0 +1,3 @@
+---
+- name: add a peer
+  shell: "rbd mirror pool peer add {{ ceph_rbd_mirror_pool }} {{ ceph_rbd_mirror_remote_user }}@{{ ceph_rbd_mirror_remote_cluster }}"
diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml
new file mode 100644
index 000000000..05fbfff74
--- /dev/null
+++ b/roles/ceph-rbd-mirror/tasks/main.yml
@@ -0,0 +1,5 @@
+---
+- include: pre_requisite.yml
+- include: start_rbd_mirror.yml
+- include: configure_mirroring.yml
+  when: ceph_rbd_mirror_configure
diff --git a/roles/ceph-rbd-mirror/tasks/pre_requisite.yml b/roles/ceph-rbd-mirror/tasks/pre_requisite.yml
new file mode 100644
index 000000000..3d74d3f5c
--- /dev/null
+++ b/roles/ceph-rbd-mirror/tasks/pre_requisite.yml
@@ -0,0 +1,28 @@
+---
+- name: install dependencies
+  apt:
+    pkg: rbd-mirror
+    state: present
+  when: ansible_os_family == 'Debian'
+  tags:
+    - package-install
+
+- name: install dependencies
+  # XXX Determine what RH repository this will belong to so that it can be
+  # properly checked and errored if the repository is not enabled.
+  yum:
+    name: rbd-mirror
+    state: present
+  when: ansible_os_family == 'RedHat'
+  tags:
+    - package-install
+
+- name: copy ceph admin key
+  copy:
+    src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring"
+    dest: "/etc/ceph/{{ cluster }}.client.admin.keyring"
+    owner: "{{ key_owner }}"
+    group: "{{ key_group }}"
+    mode: "{{ key_mode }}"
+  when:
+    cephx
diff --git a/roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
new file mode 100644
index 000000000..cf2c47fb5
--- /dev/null
+++ b/roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
@@ -0,0 +1,36 @@
+---
+- name: start and add that the rbd mirror service to the init sequence (ubuntu)
+  command: initctl emit ceph-rbd-mirror cluster={{ cluster }} id={{ ansible_hostname }}
+  changed_when: false
+  failed_when: false
+  when: ansible_distribution == "Ubuntu"
+
+# NOTE (leseb): somehow the service ansible module is messing things up
+# as a safety measure we run the raw command
+- name: start and add that the rbd mirror service to the init sequence
+  command: service ceph start ceph-rbd-mirror
+  changed_when: false
+  when:
+    ansible_distribution != "Ubuntu" and
+    not is_ceph_infernalis
+
+- name: enable systemd unit file for the rbd mirror service (for or after infernalis)
+  file:
+    src: /usr/lib/systemd/system/ceph-rbd-mirror@.service
+    dest: "/etc/systemd/system/multi-user.target.wants/ceph-rbd-mirror@{{ ceph_rbd_mirror_local_user }}.service"
+    state: link
+  changed_when: false
+  failed_when: false
+  when:
+    ansible_distribution != "Ubuntu" and
+    is_ceph_infernalis
+
+- name: start and add that the rbd mirror service to the init sequence (for or after infernalis)
+  service:
+      name: "ceph-rbd-mirror@{{ ceph_rbd_mirror_local_user }}"
+      state: started
+      enabled: yes
+  changed_when: false
+  when:
+    ansible_distribution != "Ubuntu" and
+    is_ceph_infernalis
diff --git a/rolling_update.yml b/rolling_update.yml
index 7e89c4b43..b0f02573b 100644
--- a/rolling_update.yml
+++ b/rolling_update.yml
@@ -30,7 +30,8 @@
   post_tasks:
     - name: Check if sysvinit
       stat: >
-        path=/var/lib/ceph/mon/ceph-{{ ansible_hostname }}/sysvinit
+        path=/etc/rc?.d/S??ceph
+        follow=yes
       register: monsysvinit
 
     - name: Check if upstart
@@ -49,7 +50,6 @@
       service: >
         name=ceph
         state=restarted
-        args=mon
       when: monsysvinit.stat.exists == True
 
     - name: restart monitor(s)
@@ -57,6 +57,13 @@
         name=ceph
         state=restarted
         args=mon
+      when: not ansible_os_family == "RedHat"
+
+    - name: restart monitor(s)
+      service: >
+        name=ceph
+        state=restarted
+      when: ansible_os_family == "RedHat"
 
     - name: select a running monitor
       set_fact: mon_host={{ item }}
@@ -113,7 +120,6 @@
       service: >
         name=ceph
         state=restarted
-        args=osd
       when: osdsysvinit.rc == 0
 
     - name: Waiting for clean PGs...
diff --git a/site.yml.sample b/site.yml.sample
index 90239cb4b..f2e81dce7 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -30,3 +30,8 @@
   become: True
   roles:
   - ceph-restapi
+
+- hosts: rbdmirrors
+  become: True
+  roles:
+  - ceph-rbd-mirror
diff --git a/test.yml b/test.yml
index d01a16d2b..f5feddb40 100644
--- a/test.yml
+++ b/test.yml
@@ -1,9 +1,13 @@
 ---
 - hosts: localhost
-  sudo: true
+  become: true
   roles:
     - ceph.ceph-common
     - ceph-mon
     - ceph-osd
     - ceph-mds
     - ceph-rgw
+    - ceph-fetch-keys
+    - ceph-agent
+    - ceph-common-coreos
+    - ceph-rbd-mirror