commit a2d6b251742d100e8435b07f46fb2806618363ad
author Xiaohua Zhang <xiaohua.zhang@windriver.com> Mon Apr 27 13:55:03 2020 +0000
committer Gerrit Code Review <gerrit@o-ran-sc.org> Mon Apr 27 13:55:03 2020 +0000
tree 0baf03695eb6616b8e6bfc88325827583f9e0c67
parent 56dd6e72e178deebef4cc9fa71c9dc25918b1e86
parent 4d98b2cab65d35d9a154edfd8a5b1044b9de66a1

Merge "keystone: switch keystone frontend to gunicorn to align with stx"

meta-stx/recipes-devtools/python/python-keystone_git.bb

diff --git a/meta-stx/recipes-devtools/python/python-keystone_git.bb b/meta-stx/recipes-devtools/python/python-keystone_git.bb
index e6f3b6c..7aee7bf 100644
--- a/meta-stx/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-stx/recipes-devtools/python/python-keystone_git.bb
@@ -85,14 +85,13 @@
 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}
-    install -m 755 -d ${KEYSTONE_DATA_DIR}
     install -m 755 -d ${APACHE_CONF_DIR}
     install -d ${D}${localstatedir}/log/${SRCNAME}
 
@@ -192,6 +191,7 @@
     
     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
@@ -210,11 +210,6 @@
     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"
 
 SYSTEMD_PACKAGES += "${SRCNAME}-setup"
@@ -241,6 +236,7 @@
     ${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \
     ${sysconfdir}/apache2/conf.d/keystone.conf \
     ${systemd_system_unitdir}/openstack-keystone.service \
+    ${datadir} \
     "
 
 DEPENDS += " \

meta-stx/recipes-httpd/apache2/apache2_%.bbappend

diff --git a/meta-stx/recipes-httpd/apache2/apache2_%.bbappend b/meta-stx/recipes-httpd/apache2/apache2_%.bbappend
index 2799dfc..4ac56c2 100644
--- a/meta-stx/recipes-httpd/apache2/apache2_%.bbappend
+++ b/meta-stx/recipes-httpd/apache2/apache2_%.bbappend
@@ -26,3 +26,6 @@
 
 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"