starlingx/meta-starlingx
Code Issues Proposed changes

keystone: switch keystone frontend to gunicorn to align with stx

Browse Source 
- unlink keystone service from apache2
- put app file used by gunicorn to expected directory
- disable apache2 service as default

Signed-off-by: Litao Gao <litao.gao@windriver.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Litao Gao 2020-04-27 05:35:22 -04:00 committed by Babak Sarashki
parent f304e767c9
commit 7d8df9a35c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-stx-distro/recipes-httpd/apache2/apache2_%.bbappend
View File

@ -12,3 +12,5 @@ USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "-c 'Apache' -u 48 -g apache -s /sbin/nologin -r -d /usr/share/httpd 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" GROUPADD_PARAM_${PN} = "-g 48 -r apache"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"

10
meta-stx-integ/recipes-devtools/python/python-keystone_git.bb
View File

@ -71,14 +71,13 @@ python () {
do_install_append() { do_install_append() {
KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone 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 KEYSTONE_PACKAGE_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/keystone
APACHE_CONF_DIR=${D}${sysconfdir}/apache2/conf.d/ APACHE_CONF_DIR=${D}${sysconfdir}/apache2/conf.d/
# Create directories # Create directories
install -m 755 -d ${KEYSTONE_CONF_DIR} install -m 755 -d ${KEYSTONE_CONF_DIR}
install -m 755 -d ${KEYSTONE_DATA_DIR}
install -m 755 -d ${APACHE_CONF_DIR} install -m 755 -d ${APACHE_CONF_DIR}
install -d ${D}${localstatedir}/log/${SRCNAME} install -d ${D}${localstatedir}/log/${SRCNAME}
@ -178,6 +177,7 @@ role_tree_dn = ou=Roles,${LDAP_DN} \
install -m 755 ${WORKDIR}/${PN}/stx-files/keystone-fernet-keys-rotate-active ${D}/${bindir}/keystone-fernet-keys-rotate-active 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 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 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 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/keystone-all ${D}${bindir}/keystone-all
@ -196,11 +196,6 @@ pkg_postinst_${SRCNAME}-cronjobs () {
fi fi
} }
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" PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-cronjobs"
SYSTEMD_PACKAGES += "${SRCNAME}-setup" SYSTEMD_PACKAGES += "${SRCNAME}-setup"
@ -227,6 +222,7 @@ FILES_${SRCNAME} = "${bindir}/* \
${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \ ${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \
${sysconfdir}/apache2/conf.d/keystone.conf \ ${sysconfdir}/apache2/conf.d/keystone.conf \
${systemd_system_unitdir}/openstack-keystone.service \ ${systemd_system_unitdir}/openstack-keystone.service \
${datadir} \
" "
DEPENDS += " \ DEPENDS += " \