Skip to content

Commit c73ef05

Browse files
committed
[stable-only]: Switch to uWSGI module
For some reason (pbr, setuptools, upper-constraints, devstack itself) devstack can't find /opt/stack/data/venv/bin/magnum-api-wsgi It's a partial cherry-pick of If8a155a3cebf8cd6a6d22ed7617f2777fbfac11f buster-slim got moved to debian/eol marking flannel jobs as non-voting for now Change-Id: I331ef443c626c8f8936e75ac20b76a464092fbf1 Signed-off-by: Michal Nasiadka <[email protected]>
1 parent 29707e9 commit c73ef05

File tree

4 files changed

+31
-5
lines changed

4 files changed

+31
-5
lines changed

.zuul.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,11 @@
145145
jobs:
146146
- magnum-tempest-plugin-tests-api
147147
- magnum-tempest-plugin-tests-api-jammy
148-
- magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27-flannel
148+
- magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27-flannel:
149+
voting: false
149150
- magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27-calico
150-
- magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.28-flannel
151+
- magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.28-flannel:
152+
voting: false
151153
- magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.28-calico
152154
- magnum-container-build
153155
gate:

devstack/lib/magnum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ MAGNUM_API_PASTE=$MAGNUM_CONF_DIR/api-paste.ini
4949
MAGNUM_K8S_KEYSTONE_AUTH_DEFAULT_POLICY=$MAGNUM_CONF_DIR/k8s_keystone_auth_default_policy.json
5050
MAGNUM_POLICY=$MAGNUM_CONF_DIR/policy.yaml
5151

52-
MAGNUM_UWSGI=$MAGNUM_BIN_DIR/magnum-api-wsgi
52+
MAGNUM_UWSGI=magnum.wsgi.api:application
5353
MAGNUM_UWSGI_CONF=$MAGNUM_CONF_DIR/magnum-api-uwsgi.ini
5454

5555
# Public facing bits
@@ -242,7 +242,7 @@ function create_magnum_conf {
242242

243243
iniset $MAGNUM_CONF kubernetes keystone_auth_default_policy $MAGNUM_K8S_KEYSTONE_AUTH_DEFAULT_POLICY
244244

245-
write_uwsgi_config "$MAGNUM_UWSGI_CONF" "$MAGNUM_UWSGI" "/container-infra"
245+
write_uwsgi_config "$MAGNUM_UWSGI_CONF" "$MAGNUM_UWSGI" "/container-infra" "" "magnum-api"
246246
}
247247

248248
function create_api_paste_conf {

dockerfiles/helm-client/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG HELM_VERSION=v3.2.0
2-
FROM debian:buster-slim
2+
FROM debian/eol:buster-slim
33

44
ARG HELM_VERSION
55

magnum/wsgi/api.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# -*- mode: python -*-
2+
#
3+
# Copyright 2017 SUSE Linux GmbH
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License"); you may
6+
# not use this file except in compliance with the License. You may obtain
7+
# a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14+
# License for the specific language governing permissions and limitations
15+
# under the License.
16+
17+
import sys
18+
19+
from magnum.api import app as api_app
20+
from magnum.common import service
21+
22+
service.prepare_service(sys.argv)
23+
24+
application = api_app.load_app()

0 commit comments

Comments
 (0)