2 files changed, 23 insertions, 1 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
index 99a0fc7..24bbc23 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
@@ -1171,7 +1171,12 @@ rabbit_port=5672
 # Backup backend options
 #
 
-backup_driver=cinder.backup.drivers.ceph
+backup_driver=%CINDER_BACKUP_BACKEND_DRIVER%
+
+#
+# Ceph backup backend options
+#
+
 backup_ceph_conf=/etc/ceph/ceph.conf
 backup_ceph_user=cinder-backup
 backup_ceph_chunk_size=134217728
@@ -1181,6 +1186,20 @@ backup_ceph_stripe_count=0
 restore_discard_excess_bytes=true
 
 #
+# Swift backup backend options
+#
+
+backup_swift_url=http://controller:8888/v1/AUTH_
+backup_swift_auth=per_user
+#backup_swift_user=<None>
+#backup_swift_key=<None>
+backup_swift_container=cinder-backups
+backup_swift_object_size=52428800
+backup_swift_retry_attempts=3
+backup_swift_retry_backoff=2
+backup_compression_algorithm=zlib
+
+#
 # 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 28b0f74..237377d 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -25,6 +25,8 @@ S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d identity default_configs
 
+CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift"
+
 do_install_append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
     CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
@@ -37,6 +39,7 @@ do_install_append() {
 
     sed -e "s:%DB_USER%:${DB_USER}:g" -i ${WORKDIR}/cinder.conf
     sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${WORKDIR}/cinder.conf
+    sed -e "s:%CINDER_BACKUP_BACKEND_DRIVER%:${CINDER_BACKUP_BACKEND_DRIVER}:g" -i ${WORKDIR}/cinder.conf
 
     install -d ${CINDER_CONF_DIR}
     install -m 600 ${WORKDIR}/cinder.conf ${CINDER_CONF_DIR}/