summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-trove_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-trove_git.bb')
-rwxr-xr-xmeta-openstack/recipes-devtools/python/python-trove_git.bb10
1 files changed, 0 insertions, 10 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb
index b9045e2..a0dfaa4 100755
--- a/meta-openstack/recipes-devtools/python/python-trove_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/openstack/trove.git;branch=master;protocol=https \
12 12
13SRCREV="11996635299396f181f5aec3c6825f8011d45e2c" 13SRCREV="11996635299396f181f5aec3c6825f8011d45e2c"
14PV="4.0.0+git${SRCPV}" 14PV="4.0.0+git${SRCPV}"
15S = "${WORKDIR}/git"
16 15
17inherit update-rc.d setuptools3 identity hosts useradd default_configs 16inherit update-rc.d setuptools3 identity hosts useradd default_configs
18 17
@@ -60,7 +59,6 @@ do_install:append() {
60 done 59 done
61 fi 60 fi
62 61
63
64 install -d ${D}${localstatedir}/lib/trove 62 install -d ${D}${localstatedir}/lib/trove
65 63
66 cp -r ${TEMPLATE_CONF_DIR}/* ${TROVE_CONF_DIR} 64 cp -r ${TEMPLATE_CONF_DIR}/* ${TROVE_CONF_DIR}
@@ -116,10 +114,8 @@ do_install:append() {
116 -i ${TROVE_CONF_DIR}/$file 114 -i ${TROVE_CONF_DIR}/$file
117 done 115 done
118 116
119
120 done 117 done
121 118
122
123 # Modify api-paste.ini 119 # Modify api-paste.ini
124 sed -e "s:%SERVICE_TENANT_NAME%:${TROVE_TENANT}:g" \ 120 sed -e "s:%SERVICE_TENANT_NAME%:${TROVE_TENANT}:g" \
125 -i ${TROVE_CONF_DIR}/api-paste.ini 121 -i ${TROVE_CONF_DIR}/api-paste.ini
@@ -140,10 +136,8 @@ do_install:append() {
140 sed "/^${delete}\(.*\)/d" -i ${TROVE_CONF_DIR}/api-paste.ini 136 sed "/^${delete}\(.*\)/d" -i ${TROVE_CONF_DIR}/api-paste.ini
141 done 137 done
142 138
143
144} 139}
145 140
146
147pkg_postinst:${SRCNAME}-setup () { 141pkg_postinst:${SRCNAME}-setup () {
148 # python-trove-setup postinst start 142 # python-trove-setup postinst start
149 if [ -z "$D" ]; then 143 if [ -z "$D" ]; then
@@ -171,7 +165,6 @@ pkg_postinst:${SRCNAME}-setup () {
171 fi 165 fi
172} 166}
173 167
174
175USERADD_PACKAGES = "${PN}" 168USERADD_PACKAGES = "${PN}"
176GROUPADD_PARAM:${PN} = "--system trove" 169GROUPADD_PARAM:${PN} = "--system trove"
177USERADD_PARAM:${PN} = "--system --home /var/lib/trove -g trove \ 170USERADD_PARAM:${PN} = "--system --home /var/lib/trove -g trove \
@@ -231,8 +224,6 @@ FILES:${SRCNAME}-setup = " \
231 ${sysconfdir}/${SRCNAME}/* \ 224 ${sysconfdir}/${SRCNAME}/* \
232 " 225 "
233 226
234
235
236DEPENDS += " \ 227DEPENDS += " \
237 python-pbr \ 228 python-pbr \
238 python-pip \ 229 python-pip \
@@ -315,7 +306,6 @@ RDEPENDS:${SRCNAME}-tests += " \
315 python-pexpect \ 306 python-pexpect \
316 " 307 "
317 308
318
319INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-conductor ${SRCNAME}-taskmanager" 309INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-conductor ${SRCNAME}-taskmanager"
320 310
321INITSCRIPT_NAME:${SRCNAME}-api = "trove-api" 311INITSCRIPT_NAME:${SRCNAME}-api = "trove-api"