diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-barbican_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-barbican_git.bb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index c3b2896..0b3d768 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb | |||
@@ -19,7 +19,7 @@ SRCREV = "e6f05febbe18a86e4e6b05acc5f4868fa3beb291" | |||
19 | PV = "2015.1.0+git${SRCPV}" | 19 | PV = "2015.1.0+git${SRCPV}" |
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | inherit update-rc.d setuptools identity hosts useradd default_configs openstackchef monitor | 22 | inherit update-rc.d setuptools identity hosts useradd default_configs monitor |
23 | 23 | ||
24 | SERVICECREATE_PACKAGES = "${SRCNAME}-setup" | 24 | SERVICECREATE_PACKAGES = "${SRCNAME}-setup" |
25 | KEYSTONE_HOST="${CONTROLLER_IP}" | 25 | KEYSTONE_HOST="${CONTROLLER_IP}" |
@@ -48,10 +48,8 @@ do_install_append() { | |||
48 | cp -r ${TEMPLATE_CONF_DIR}/* ${BARBICAN_CONF_DIR} | 48 | cp -r ${TEMPLATE_CONF_DIR}/* ${BARBICAN_CONF_DIR} |
49 | 49 | ||
50 | install -d ${D}${localstatedir}/lib/barbican | 50 | install -d ${D}${localstatedir}/lib/barbican |
51 | if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then | 51 | sed -e "s:%BARBICAN_MAX_PACKET_SIZE%:${BARBICAN_MAX_PACKET_SIZE}:g" -i ${BARBICAN_CONF_DIR}/vassals/barbican-api.ini |
52 | sed -e "s:%BARBICAN_MAX_PACKET_SIZE%:${BARBICAN_MAX_PACKET_SIZE}:g" -i ${BARBICAN_CONF_DIR}/vassals/barbican-api.ini | 52 | sed -e "s:%BARBICAN_MAX_PACKET_SIZE%:${BARBICAN_MAX_PACKET_SIZE}:g" -i ${BARBICAN_CONF_DIR}/vassals/barbican-admin.ini |
53 | sed -e "s:%BARBICAN_MAX_PACKET_SIZE%:${BARBICAN_MAX_PACKET_SIZE}:g" -i ${BARBICAN_CONF_DIR}/vassals/barbican-admin.ini | ||
54 | fi | ||
55 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
56 | install -d ${D}${sysconfdir}/init.d | 54 | install -d ${D}${sysconfdir}/init.d |
57 | 55 | ||
@@ -68,10 +66,6 @@ do_install_append() { | |||
68 | -i ${D}/${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/api/test_resources_policy.py | 66 | -i ${D}/${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/api/test_resources_policy.py |
69 | } | 67 | } |
70 | 68 | ||
71 | CHEF_SERVICES_CONF_FILES :="\ | ||
72 | ${sysconfdir}/${SRCNAME}/vassals/barbican-api.ini \ | ||
73 | ${sysconfdir}/${SRCNAME}/vassals/barbican-admin.ini \ | ||
74 | " | ||
75 | USERADD_PACKAGES = "${PN}" | 69 | USERADD_PACKAGES = "${PN}" |
76 | GROUPADD_PARAM_${PN} = "--system barbican" | 70 | GROUPADD_PARAM_${PN} = "--system barbican" |
77 | USERADD_PARAM_${PN} = "--system --home /var/lib/barbican -g barbican \ | 71 | USERADD_PARAM_${PN} = "--system --home /var/lib/barbican -g barbican \ |