summaryrefslogtreecommitdiffstats
path: root/meta-openstack
diff options
context:
space:
mode:
authorMihai Prica <prica.mihai@gmail.com>2013-07-25 17:04:02 +0300
committerBruce Ashfield <bruce.ashfield@windriver.com>2013-08-28 18:41:59 -0400
commitb53d2204c47e207e8dece96d299af5a0029693e4 (patch)
tree8a513928bf06b982311d76c9634cb402fcd76e29 /meta-openstack
parentea62a12407366f890b1a83d439e15072f5f4734c (diff)
downloadmeta-cloud-services-b53d2204c47e207e8dece96d299af5a0029693e4.tar.gz
python-cinder: Add cinder-scheduler package
This package contains the cinder-scheduler executable and an initscript that starts the cinder-scheduler at boot time. Signed-off-by: Mihai Prica <prica.mihai@gmail.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb11
-rw-r--r--meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb1
2 files changed, 10 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb b/meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb
index 83d583d..a71e2ae 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb
@@ -42,6 +42,8 @@ do_install_append() {
42 install -d ${D}${sysconfdir}/init.d 42 install -d ${D}${sysconfdir}/init.d
43 sed 's:@suffix@:api:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-api.init.sh 43 sed 's:@suffix@:api:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-api.init.sh
44 install -m 0755 ${WORKDIR}/cinder-api.init.sh ${D}${sysconfdir}/init.d/cinder-api 44 install -m 0755 ${WORKDIR}/cinder-api.init.sh ${D}${sysconfdir}/init.d/cinder-api
45 sed 's:@suffix@:scheduler:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-scheduler.init.sh
46 install -m 0755 ${WORKDIR}/cinder-scheduler.init.sh ${D}${sysconfdir}/init.d/cinder-scheduler
45 install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume 47 install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume
46 fi 48 fi
47} 49}
@@ -67,7 +69,7 @@ pkg_postinst_${SRCNAME} () {
67 echo "include /etc/cinder/data/volumes/*" >> /etc/tgt/targets.conf 69 echo "include /etc/cinder/data/volumes/*" >> /etc/tgt/targets.conf
68} 70}
69 71
70PACKAGES += "${SRCNAME} ${SRCNAME}-api ${SRCNAME}-volume" 72PACKAGES += "${SRCNAME} ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler"
71 73
72FILES_${PN} = "${libdir}/*" 74FILES_${PN} = "${libdir}/*"
73 75
@@ -77,6 +79,9 @@ FILES_${SRCNAME}-api = "${bindir}/cinder-api \
77FILES_${SRCNAME}-volume = "${bindir}/cinder-volume \ 79FILES_${SRCNAME}-volume = "${bindir}/cinder-volume \
78 ${sysconfdir}/init.d/cinder-volume" 80 ${sysconfdir}/init.d/cinder-volume"
79 81
82FILES_${SRCNAME}-scheduler = "${bindir}/cinder-scheduler \
83 ${sysconfdir}/init.d/cinder-scheduler"
84
80FILES_${SRCNAME} = "${bindir}/* \ 85FILES_${SRCNAME} = "${bindir}/* \
81 ${sysconfdir}/${SRCNAME}/* " 86 ${sysconfdir}/${SRCNAME}/* "
82 87
@@ -111,7 +116,9 @@ RDEPENDS_${SRCNAME} = "${PN} \
111 116
112RDEPENDS_${SRCNAME}-api = "${SRCNAME}" 117RDEPENDS_${SRCNAME}-api = "${SRCNAME}"
113RDEPENDS_${SRCNAME}-volume = "${SRCNAME}" 118RDEPENDS_${SRCNAME}-volume = "${SRCNAME}"
119RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}"
114 120
115INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume" 121INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler"
116INITSCRIPT_NAME_${SRCNAME}-api = "cinder-api" 122INITSCRIPT_NAME_${SRCNAME}-api = "cinder-api"
117INITSCRIPT_NAME_${SRCNAME}-volume = "cinder-volume" 123INITSCRIPT_NAME_${SRCNAME}-volume = "cinder-volume"
124INITSCRIPT_NAME_${SRCNAME}-scheduler = "cinder-scheduler"
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
index 024820a..b86e1de 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
@@ -20,5 +20,6 @@ RDEPENDS_${PN} = " postgresql \
20 openvswitch-controller \ 20 openvswitch-controller \
21 cinder-api \ 21 cinder-api \
22 cinder-volume \ 22 cinder-volume \
23 cinder-scheduler \
23 horizon \ 24 horizon \
24 " 25 "