Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: vexxhost/docker-atmosphere/.github/actions/checkout@a1ad25c00b6bbf44621748b3a9ed664c6b6cf929 # main
with:
repository: openstack/keystone
ref: a568938e0c967a56ade269c93f42718008487b14 # master
ref: b6fd80996b882890a51f3e2aab41d952d7ff68ae # master

- uses: vexxhost/docker-atmosphere/.github/actions/build-image@a1ad25c00b6bbf44621748b3a9ed664c6b6cf929 # main
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
From 3d312a6ce35734aa490b2928d0a6f59fd2077119 Mon Sep 17 00:00:00 2001
From 817abe6c2ba5bd64bcb5110f128c723e783c410d Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Mon, 8 Sep 2025 09:56:09 +0800
Date: Thu, 23 Apr 2026 01:24:42 +0000
Subject: [PATCH] Revert "setup: Remove pbr's wsgi_scripts"

This reverts commit 0d2cc1a3af4dbd2825cef5992056bffe935eaadd.
---
pyproject.toml | 4 ++++
.../notes/remove-wsgi-scripts-615b97ee4d6e0de2.yaml | 8 --------
setup.cfg | 4 ++++
2 files changed, 4 insertions(+), 8 deletions(-)
delete mode 100644 releasenotes/notes/remove-wsgi-scripts-615b97ee4d6e0de2.yaml

diff --git a/pyproject.toml b/pyproject.toml
index 4d27974..136f34b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -165,6 +165,10 @@ keystone = "keystone.common.policies:list_rules"
keystone-manage = "keystone.cmd.manage:main"
keystone-status = "keystone.cmd.status:main"

+[project.entry-points.wsgi_scripts]
+keystone-wsgi-admin = "keystone.server.wsgi:initialize_admin_application"
+keystone-wsgi-public = "keystone.server.wsgi:initialize_public_application"
+
[project.optional-dependencies]
ldap = [
"python-ldap>=3.0.0", # PSF
diff --git a/releasenotes/notes/remove-wsgi-scripts-615b97ee4d6e0de2.yaml b/releasenotes/notes/remove-wsgi-scripts-615b97ee4d6e0de2.yaml
deleted file mode 100644
index 7eb670e3c..000000000
index 7eb670e..0000000
--- a/releasenotes/notes/remove-wsgi-scripts-615b97ee4d6e0de2.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
Expand All @@ -24,20 +39,6 @@ index 7eb670e3c..000000000
- module paths for the service, ``keystone.wsgi.api``, if their chosen WSGI
- server supports this (gunicorn, uWSGI) or implement a ``.wsgi`` script
- themselves if not (mod_wsgi).
diff --git a/setup.cfg b/setup.cfg
index 7b0662c7e..1511d4dd5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,6 +38,10 @@ console_scripts =
keystone-manage = keystone.cmd.manage:main
keystone-status = keystone.cmd.status:main

+wsgi_scripts =
+ keystone-wsgi-admin = keystone.server.wsgi:initialize_admin_application
+ keystone-wsgi-public = keystone.server.wsgi:initialize_public_application
+
keystone.assignment =
sql = keystone.assignment.backends.sql:Assignment

--
2.25.1

This file was deleted.

Loading