Skip to content

Commit 1e217ef

Browse files
Merge pull request #333 from raukadah/OSPCIX-1052
Add cinder-wsgi in tcib and reuse it from here
2 parents a5047e6 + cca8d55 commit 1e217ef

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#! /usr/bin/python3 -sP
2+
# PBR Generated from 'wsgi_scripts'
3+
4+
import threading
5+
6+
try:
7+
from cinder.wsgi.api import application
8+
except ImportError:
9+
from cinder.wsgi.wsgi import initialize_application
10+
application = None
11+
app_lock = threading.Lock()
12+
with app_lock:
13+
if application is None:
14+
application = initialize_application()

container-images/tcib/base/os/cinder-base/cinder-api/cinder-api.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tcib_actions:
22
- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
3-
- run: mkdir -p /var/www/cgi-bin/cinder && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
4-
- run: chown -R cinder /var/www/cgi-bin/cinder && chmod 755 /var/www/cgi-bin/cinder/cinder-wsgi
3+
- run: mkdir -p /var/www/cgi-bin/cinder && chown -R cinder /var/www/cgi-bin/cinder
4+
- run: cp -a /usr/share/tcib/container-images/kolla/wsgi/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi && chmod 755 /var/www/cgi-bin/cinder/cinder-wsgi
55
tcib_packages:
66
common:
77
- httpd

0 commit comments

Comments
 (0)