summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python
diff options
context:
space:
mode:
authorVu Tran <vu.tran@windriver.com>2014-03-18 21:01:00 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-03-24 16:41:59 -0400
commitd156d7e1155fc325cb398f98ed41b540031c9df3 (patch)
treeba2a39a7f0254c7353a45356b01e3ecc87246eab /meta-openstack/recipes-devtools/python
parent70ed2ece07ffc406249dcc4edc17ee2cdfcf5d9d (diff)
downloadmeta-cloud-services-d156d7e1155fc325cb398f98ed41b540031c9df3.tar.gz
cinder: enable cinder-backup to use ceph
Enable cinder-backup to use ceph as backend. It mainly changes cinder.conf and creates cinder-backup package. Signed-off-by: Vu Tran <vu.tran@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python')
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder/cinder.conf13
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder_git.bb11
2 files changed, 22 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
1168 1168
1169 1169
1170# 1170#
1171# Backup backend options
1172#
1173
1174backup_driver=cinder.backup.drivers.ceph
1175backup_ceph_conf=/etc/ceph/ceph.conf
1176backup_ceph_user=cinder-backup
1177backup_ceph_chunk_size=134217728
1178backup_ceph_pool=cinder-backups
1179backup_ceph_stripe_unit=0
1180backup_ceph_stripe_count=0
1181restore_discard_excess_bytes=true
1182
1183#
1171# Multi backend options 1184# Multi backend options
1172# 1185#
1173 1186
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() {
54 install -m 0755 ${WORKDIR}/cinder-api.init.sh ${D}${sysconfdir}/init.d/cinder-api 54 install -m 0755 ${WORKDIR}/cinder-api.init.sh ${D}${sysconfdir}/init.d/cinder-api
55 sed 's:@suffix@:scheduler:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-scheduler.init.sh 55 sed 's:@suffix@:scheduler:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-scheduler.init.sh
56 install -m 0755 ${WORKDIR}/cinder-scheduler.init.sh ${D}${sysconfdir}/init.d/cinder-scheduler 56 install -m 0755 ${WORKDIR}/cinder-scheduler.init.sh ${D}${sysconfdir}/init.d/cinder-scheduler
57 sed 's:@suffix@:backup:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-backup.init.sh
58 install -m 0755 ${WORKDIR}/cinder-backup.init.sh ${D}${sysconfdir}/init.d/cinder-backup
57 install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume 59 install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume
58 fi 60 fi
59 61
@@ -103,7 +105,7 @@ pkg_postinst_${SRCNAME}-setup () {
103 fi 105 fi
104} 106}
105 107
106PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler" 108PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup"
107ALLOW_EMPTY_${SRCNAME}-setup = "1" 109ALLOW_EMPTY_${SRCNAME}-setup = "1"
108 110
109FILES_${PN} = "${libdir}/*" 111FILES_${PN} = "${libdir}/*"
@@ -120,6 +122,9 @@ FILES_${SRCNAME}-volume = "${bindir}/cinder-volume \
120FILES_${SRCNAME}-scheduler = "${bindir}/cinder-scheduler \ 122FILES_${SRCNAME}-scheduler = "${bindir}/cinder-scheduler \
121 ${sysconfdir}/init.d/cinder-scheduler" 123 ${sysconfdir}/init.d/cinder-scheduler"
122 124
125FILES_${SRCNAME}-backup = "${bindir}/cinder-backup \
126 ${sysconfdir}/init.d/cinder-backup"
127
123FILES_${SRCNAME} = "${bindir}/* \ 128FILES_${SRCNAME} = "${bindir}/* \
124 ${sysconfdir}/${SRCNAME}/* \ 129 ${sysconfdir}/${SRCNAME}/* \
125 ${localstatedir}/* \ 130 ${localstatedir}/* \
@@ -166,10 +171,12 @@ RDEPENDS_${SRCNAME}-volume = "${SRCNAME}"
166RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}" 171RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}"
167RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" 172RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}"
168 173
169INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler" 174INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup"
170INITSCRIPT_NAME_${SRCNAME}-api = "cinder-api" 175INITSCRIPT_NAME_${SRCNAME}-api = "cinder-api"
171INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" 176INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
172INITSCRIPT_NAME_${SRCNAME}-volume = "cinder-volume" 177INITSCRIPT_NAME_${SRCNAME}-volume = "cinder-volume"
173INITSCRIPT_PARAMS_${SRCNAME}-volume = "${OS_DEFAULT_INITSCRIPT_PARAMS}" 178INITSCRIPT_PARAMS_${SRCNAME}-volume = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
174INITSCRIPT_NAME_${SRCNAME}-scheduler = "cinder-scheduler" 179INITSCRIPT_NAME_${SRCNAME}-scheduler = "cinder-scheduler"
175INITSCRIPT_PARAMS_${SRCNAME}-scheduler = "${OS_DEFAULT_INITSCRIPT_PARAMS}" 180INITSCRIPT_PARAMS_${SRCNAME}-scheduler = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
181INITSCRIPT_NAME_${SRCNAME}-backup = "cinder-backup"
182INITSCRIPT_PARAMS_${SRCNAME}-backup = "${OS_DEFAULT_INITSCRIPT_PARAMS}"