From 2290ee09ef3c2cd8aaf7fe3dc40bf22eb842b3f4 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 31 Oct 2013 01:28:40 -0400
Subject: cinder: uprev to havana release

Updating the cinder block storage component to the havana release.
At the same time, we switch to a git based build.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-cinder_2013.1.3.bb               | 126 ---------------------
 1 file changed, 126 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-cinder_2013.1.3.bb

(limited to 'meta-openstack/recipes-devtools/python/python-cinder_2013.1.3.bb')

diff --git a/meta-openstack/recipes-devtools/python/python-cinder_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-cinder_2013.1.3.bb
deleted file mode 100644
index a6a10e5..0000000
--- a/meta-openstack/recipes-devtools/python/python-cinder_2013.1.3.bb
+++ /dev/null
@@ -1,126 +0,0 @@
-DESCRIPTION = "OpenStack Block storage service"
-HOMEPAGE = "https://launchpad.net/cinder"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-PR = "r0"
-SRCNAME = "cinder"
-
-SRC_URI = "https://launchpad.net/${SRCNAME}/grizzly/${PV}/+download/${SRCNAME}-${PV}.tar.gz \
-    file://cinder.conf \
-    file://cinder.init \
-    file://cinder-volume \
-	"
-
-SRC_URI[md5sum] = "2bfeacfaea7be5194587bb932dd8f693"
-SRC_URI[sha256sum] = "358ab7fb1cb57ea1f0c1d76e30d45eebb6308a6122b6e6ff6ac3405f51eceb1e"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools update-rc.d identity
-
-do_install_append() {
-    TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
-    CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
-
-    sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \
-        ${TEMPLATE_CONF_DIR}/api-paste.ini > ${WORKDIR}/api-paste.ini
-    sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${WORKDIR}/api-paste.ini
-    sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \
-        -i ${WORKDIR}/api-paste.ini
-
-    sed -e "s:%DB_USER%:${DB_USER}:g" -i ${WORKDIR}/cinder.conf
-    sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${WORKDIR}/cinder.conf
-
-    install -d ${CINDER_CONF_DIR}
-    install -m 600 ${WORKDIR}/cinder.conf ${CINDER_CONF_DIR}/
-    install -m 600 ${WORKDIR}/api-paste.ini ${CINDER_CONF_DIR}/
-    install -m 600 ${S}/etc/cinder/policy.json ${CINDER_CONF_DIR}/
-
-    install -d ${D}${localstatedir}/log/${SRCNAME}
-
-    if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-        install -d ${D}${sysconfdir}/init.d
-        sed 's:@suffix@:api:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-api.init.sh
-        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
-        install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume
-    fi
-}
-
-pkg_postinst_${SRCNAME} () {
-    if [ "x$D" != "x" ]; then
-        exit 1
-    fi
-
-    # This is to make sure postgres is configured and running
-    if ! pidof postmaster > /dev/null; then
-       /etc/init.d/postgresql-init
-       /etc/init.d/postgresql start
-    fi
-
-    sudo -u postgres createdb cinder
-    cinder-manage db sync
-
-    #Create cinder volume group backing file
-    [[ -f /etc/cinder/volumes-backing ]] || truncate -s 2G /etc/cinder/volumes-backing
-    echo "include /etc/cinder/data/volumes/*" >> /etc/tgt/targets.conf
-}
-
-PACKAGES += "${SRCNAME} ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler"
-
-FILES_${PN} = "${libdir}/*"
-
-FILES_${SRCNAME}-api = "${bindir}/cinder-api \
-    ${sysconfdir}/init.d/cinder-api"
-
-FILES_${SRCNAME}-volume = "${bindir}/cinder-volume \
-    ${sysconfdir}/init.d/cinder-volume"
-
-FILES_${SRCNAME}-scheduler = "${bindir}/cinder-scheduler \
-    ${sysconfdir}/init.d/cinder-scheduler"
-
-FILES_${SRCNAME} = "${bindir}/* \
-    ${sysconfdir}/${SRCNAME}/* \
-    ${localstatedir}/* \
-    "
-
-RDEPENDS_${PN} += "lvm2 \
-    python-sqlalchemy \
-	python-amqplib \
-	python-anyjson \
-	python-eventlet \
-	python-kombu \
-	python-lxml \
-	python-routes \
-	python-webob \
-	python-greenlet \
-	python-lockfile \
-	python-pastedeploy \
-	python-paste \
-	python-sqlalchemy-migrate \
-	python-stevedore \
-	python-suds \
-	python-paramiko \
-	python-babel \
-	python-iso8601 \
-	python-setuptools-git \
-	python-glanceclient \
-	python-keystoneclient \
-	python-swiftclient \
-	python-oslo.config \
-	"
-
-RDEPENDS_${SRCNAME} = "${PN} \
-        postgresql postgresql-client python-psycopg2 tgt"
-
-RDEPENDS_${SRCNAME}-api = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-volume = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}"
-
-INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler"
-INITSCRIPT_NAME_${SRCNAME}-api = "cinder-api"
-INITSCRIPT_NAME_${SRCNAME}-volume = "cinder-volume"
-INITSCRIPT_NAME_${SRCNAME}-scheduler = "cinder-scheduler"
-- 
cgit v1.2.3-54-g00ecf