- unlink keystone service from apache2
- put app file used by gunicorn to expected directory
- disable apache2 service as default
Issue-ID: INF-37
Signed-off-by: Litao Gao <litao.gao@windriver.com>
Change-Id: Id8fcf640307582532b6aff6901d423e87e5c30a3
do_install_append() {
KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone
do_install_append() {
KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone
- KEYSTONE_DATA_DIR=${D}${localstatedir}/lib/keystone
+ KEYSTONE_DATA_DIR=${D}${datadir}/keystone
KEYSTONE_PACKAGE_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/keystone
APACHE_CONF_DIR=${D}${sysconfdir}/apache2/conf.d/
# Create directories
install -m 755 -d ${KEYSTONE_CONF_DIR}
KEYSTONE_PACKAGE_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/keystone
APACHE_CONF_DIR=${D}${sysconfdir}/apache2/conf.d/
# Create directories
install -m 755 -d ${KEYSTONE_CONF_DIR}
- install -m 755 -d ${KEYSTONE_DATA_DIR}
install -m 755 -d ${APACHE_CONF_DIR}
install -d ${D}${localstatedir}/log/${SRCNAME}
install -m 755 -d ${APACHE_CONF_DIR}
install -d ${D}${localstatedir}/log/${SRCNAME}
install -m 755 ${WORKDIR}/${PN}/stx-files/keystone-fernet-keys-rotate-active ${D}/${bindir}/keystone-fernet-keys-rotate-active
install -m 440 ${WORKDIR}/${PN}/stx-files/password-rules.conf ${KEYSTONE_CONF_DIR}/password-rules.conf
install -m 755 ${WORKDIR}/${PN}/stx-files/keystone-fernet-keys-rotate-active ${D}/${bindir}/keystone-fernet-keys-rotate-active
install -m 440 ${WORKDIR}/${PN}/stx-files/password-rules.conf ${KEYSTONE_CONF_DIR}/password-rules.conf
+ install -m 755 -d ${KEYSTONE_DATA_DIR}
install -m 755 ${WORKDIR}/${PN}/stx-files/public.py ${KEYSTONE_DATA_DIR}/public.py
install -m 644 ${WORKDIR}/${PN}/stx-files/openstack-keystone.service ${D}${systemd_system_unitdir}/openstack-keystone.service
install -m 755 ${WORKDIR}/${PN}/stx-files/keystone-all ${D}${bindir}/keystone-all
install -m 755 ${WORKDIR}/${PN}/stx-files/public.py ${KEYSTONE_DATA_DIR}/public.py
install -m 644 ${WORKDIR}/${PN}/stx-files/openstack-keystone.service ${D}${systemd_system_unitdir}/openstack-keystone.service
install -m 755 ${WORKDIR}/${PN}/stx-files/keystone-all ${D}${bindir}/keystone-all
-pkg_postinst_${SRCNAME} () {
- # openstak-keystone will be run in httpd/apache2 instead of standalone
- ln -sf ${systemd_system_unitdir}/apache2.service $D${sysconfdir}/systemd/system/openstack-keystone.service
-}
-
PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-cronjobs"
SYSTEMD_PACKAGES += "${SRCNAME}-setup"
PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-cronjobs"
SYSTEMD_PACKAGES += "${SRCNAME}-setup"
${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \
${sysconfdir}/apache2/conf.d/keystone.conf \
${systemd_system_unitdir}/openstack-keystone.service \
${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \
${sysconfdir}/apache2/conf.d/keystone.conf \
${systemd_system_unitdir}/openstack-keystone.service \
USERADD_PARAM_${PN} = "-c 'Apache' -u 48 -g apache -s /sbin/nologin -r -d /usr/share/httpd apache"
GROUPADD_PARAM_${PN} = "-g 48 -r apache"
USERADD_PARAM_${PN} = "-c 'Apache' -u 48 -g apache -s /sbin/nologin -r -d /usr/share/httpd apache"
GROUPADD_PARAM_${PN} = "-g 48 -r apache"
+
+# since we switch keystone from apache to gunicorn, disable it as default
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"