diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/.env b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/.env
new file mode 100644
index 0000000..5775f43
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican logrotate backupninja)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_ceph.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_ceph.yml
new file mode 100644
index 0000000..6e23d7d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_ceph.yml
@@ -0,0 +1,38 @@
+classes:
+- system.ceph.backup.client.single
+parameters:
+  _param:
+    ceph_remote_backup_server: ${_param:openstack_control_node03_address}
+    root_private_key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+      k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+      Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+      6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+      lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+      MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+      yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+      dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+      FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+      5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+      g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+      AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+      CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+      H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+      gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+      MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+      lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+      ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+      SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+      HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+      0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+      M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+      erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+      aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+      7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+      -----END RSA PRIVATE KEY-----
+  ceph:
+    backup:
+      client:
+        target:
+          backup_dir: /srv/glusterfs/backup/ceph
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml
index 79b8f6b..251162c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml
@@ -36,5 +36,5 @@
   backupninja:
     client:
       target:
-        home_dir: /srv/volumes/backup/backupninja
+        home_dir: /srv/glusterfs/backup/backupninja
         engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml
index 9d0cace..60b9868 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml
@@ -34,4 +34,4 @@
   xtrabackup:
     server:
       enabled: false
-      backup_dir: /srv/volumes/backup/xtrabackup
+      backup_dir: /srv/glusterfs/backup/xtrabackup
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml
index 8f84903..57a6eb3 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml
@@ -1,15 +1,20 @@
 classes:
 - system.backupninja.server.single
 - system.xtrabackup.server.single
+- system.ceph.backup.server.single
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.backup
 parameters:
   _param:
     backupninja_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
     xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+    ceph_backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
   backupninja:
     server:
-      home_dir: /srv/volumes/backup/backupninja
+      home_dir: /srv/glusterfs/backup/backupninja
   xtrabackup:
     server:
-      backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
+      backup_dir: /srv/glusterfs/backup/xtrabackup
+  ceph:
+    backup:
+      backup_dir: /srv/glusterfs/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
index 96c4ca8..c271a4b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
@@ -13,6 +13,8 @@
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.salt_pki
 - system.keystone.client.single
 - system.keystone.client.service.aodh
 - system.keystone.client.service.ceilometer
@@ -154,6 +156,9 @@
               value_template: <<node_control_ip>>
         ceph_mon_node01:
           expression: <<node_hostname>>__equals__cmn01
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.infra.backup.client_ceph
           cluster_param:
             ceph_mon_node01_address:
               value_template: <<node_control_ip>>
@@ -235,6 +240,9 @@
           - cluster.virtual-mcp-pike-dvr-ceph-rgw.openstack.proxy
           params:
             linux_system_codename: xenial
+        ceph_mon_node01:
+          classes:
+          - cluster.virtual-mcp-pike-dvr-ceph-rgw.infra.backup.client_ceph
         infra_storage_rack01:
           name: osd0<<count>>
           domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
index 8ad6fe3..d94026e 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
@@ -10,6 +10,7 @@
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.client.cluster
+- system.glusterfs.server.volume.salt_pki
 - system.glusterfs.client.volume.glance
 - system.glusterfs.client.volume.keystone
 - system.glusterfs.server.volume.glance