Added cinder-backup service

examples/nodes/ceph-1.iaas.yaml

@@ -26,5 +26,10 @@ ceph::keys::args:
     inject: true
     inject_as_id: mon.
     inject_keyring: /var/lib/ceph/mon/ceph-%{::hostname}/keyring
-
-#ceph auth get-or-create client.cinder-backup mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool=backups'
+  client.cinder-backup:
+    secret: AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==
+    cap_mon: allow r
+    cap_osd: allow class-read object_prefix rbd_children, allow rwx pool=backups
+    inject: true
+    inject_as_id: mon.
+    inject_keyring: /var/lib/ceph/mon/ceph-%{::hostname}/keyring

examples/nodes/ceph-2.iaas.yaml

@@ -26,3 +26,10 @@ ceph::keys::args:
     inject: true
     inject_as_id: mon.
     inject_keyring: /var/lib/ceph/mon/ceph-%{::hostname}/keyring
+  client.cinder-backup:
+    secret: AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==
+    cap_mon: allow r
+    cap_osd: allow class-read object_prefix rbd_children, allow rwx pool=backups
+    inject: true
+    inject_as_id: mon.
+    inject_keyring: /var/lib/ceph/mon/ceph-%{::hostname}/keyring

examples/nodes/ceph-3.iaas.yaml

@@ -26,3 +26,10 @@ ceph::keys::args:
     inject: true
     inject_as_id: mon.
     inject_keyring: /var/lib/ceph/mon/ceph-%{::hostname}/keyring
+  client.cinder-backup:
+    secret: AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==
+    cap_mon: allow r
+    cap_osd: allow class-read object_prefix rbd_children, allow rwx pool=backups
+    inject: true
+    inject_as_id: mon.
+    inject_keyring: /var/lib/ceph/mon/ceph-%{::hostname}/keyring

examples/nodes/controller-1.iaas.yaml

@@ -19,3 +19,10 @@ ceph::keys::args:
     user: cinder
     group: cinder
     mode: '0550'
+  client.cinder-backup:
+    secret: AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==
+    cap_mon: allow r
+    cap_osd: allow class-read object_prefix rbd_children, allow rwx pool=backups
+    user: cinder
+    group: cinder
+    mode: '0550'

examples/nodes/controller-2.iaas.yaml

@@ -19,3 +19,10 @@ ceph::keys::args:
     user: cinder
     group: cinder
     mode: '0550'
+  client.cinder-backup:
+    secret: AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==
+    cap_mon: allow r
+    cap_osd: allow class-read object_prefix rbd_children, allow rwx pool=backups
+    user: cinder
+    group: cinder
+    mode: '0550'

examples/nodes/controller-3.iaas.yaml

@@ -19,3 +19,10 @@ ceph::keys::args:
     user: cinder
     group: cinder
     mode: '0550'
+  client.cinder-backup:
+    secret: AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==
+    cap_mon: allow r
+    cap_osd: allow class-read object_prefix rbd_children, allow rwx pool=backups
+    user: cinder
+    group: cinder
+    mode: '0550'

manifests/profile/cinder.pp

@@ -37,12 +37,10 @@ class iaas::profile::cinder (
   class { '::cinder::api':
     keystone_password => $password,
     keystone_auth_host => $endpoint,
-    enabled => true,
   }
 
   class { '::cinder::scheduler':
     scheduler_driver => 'cinder.scheduler.simple.SimpleScheduler',
-    enabled => true,
   }
 
   class { '::cinder::setup_test_volume':
@@ -50,10 +48,7 @@ class iaas::profile::cinder (
     size => $volume_size
   } ->
 
-  class { '::cinder::volume':
-    package_ensure => present,
-    enabled => true,
-  }
+  class { '::cinder::volume': }
 
   class { '::cinder::volume::rbd':
     rbd_pool => 'volumes',
@@ -61,6 +56,11 @@ class iaas::profile::cinder (
     rbd_secret_uuid => $secret, #FIXME Necessary ?
   }
 
+  class { '::cinder::backup': }
+  class { '::cinder::backup::ceph':
+    backup_ceph_user => 'cinder-backup',
+  }
+
   @@haproxy::balancermember { "cinder_api_${::fqdn}":
     listening_service => 'cinder_api_cluster',
     server_names => $::hostname,

manifests/role/storage.pp

@@ -50,4 +50,7 @@ ceph-disk list 2> /dev/null | grep ' *${osd_disk}${osd_partition}.*ceph data'
   ceph::pool { 'vms':
     pg_num => 128,
   }
+  ceph::pool { 'backups':
+    pg_num => 128,
+  }
 }