3 files changed, 23 insertions, 2 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
index 10d7d9a..fff6910 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
@@ -1168,6 +1168,19 @@ rabbit_port=5672
 
 
 #
+# Backup backend options
+#
+
+backup_driver=cinder.backup.drivers.ceph
+backup_ceph_conf=/etc/ceph/ceph.conf
+backup_ceph_user=cinder-backup
+backup_ceph_chunk_size=134217728
+backup_ceph_pool=cinder-backups
+backup_ceph_stripe_unit=0
+backup_ceph_stripe_count=0
+restore_discard_excess_bytes=true
+
+#
 # Multi backend options
 #
 
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index e03b54f..a06aca7 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -54,6 +54,8 @@ do_install_append() {
         install -m 0755 ${WORKDIR}/cinder-api.init.sh ${D}${sysconfdir}/init.d/cinder-api
         sed 's:@suffix@:scheduler:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-scheduler.init.sh
         install -m 0755 ${WORKDIR}/cinder-scheduler.init.sh ${D}${sysconfdir}/init.d/cinder-scheduler
+        sed 's:@suffix@:backup:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-backup.init.sh
+        install -m 0755 ${WORKDIR}/cinder-backup.init.sh ${D}${sysconfdir}/init.d/cinder-backup
         install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume
     fi
 
@@ -103,7 +105,7 @@ pkg_postinst_${SRCNAME}-setup () {
     fi
 }
 
-PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler"
+PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup"
 ALLOW_EMPTY_${SRCNAME}-setup = "1"
 
 FILES_${PN} = "${libdir}/*"
@@ -120,6 +122,9 @@ FILES_${SRCNAME}-volume = "${bindir}/cinder-volume \
 FILES_${SRCNAME}-scheduler = "${bindir}/cinder-scheduler \
     ${sysconfdir}/init.d/cinder-scheduler"
 
+FILES_${SRCNAME}-backup = "${bindir}/cinder-backup \
+    ${sysconfdir}/init.d/cinder-backup"
+
 FILES_${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
     ${localstatedir}/* \
@@ -166,10 +171,12 @@ RDEPENDS_${SRCNAME}-volume = "${SRCNAME}"
 RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}"
 RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}"
 
-INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler"
+INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup"
 INITSCRIPT_NAME_${SRCNAME}-api = "cinder-api"
 INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 INITSCRIPT_NAME_${SRCNAME}-volume = "cinder-volume"
 INITSCRIPT_PARAMS_${SRCNAME}-volume = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 INITSCRIPT_NAME_${SRCNAME}-scheduler = "cinder-scheduler"
 INITSCRIPT_PARAMS_${SRCNAME}-scheduler = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME_${SRCNAME}-backup = "cinder-backup"
+INITSCRIPT_PARAMS_${SRCNAME}-backup = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
index 2b56292..062fe6e 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
@@ -28,6 +28,7 @@ RDEPENDS_${PN} = " postgresql-setup \
     cinder-api \
     cinder-volume \
     cinder-scheduler \
+    cinder-backup \
     cinder-setup \
     ceilometer-setup \
     ceilometer-api \