Update manifest.yaml file for ussuri openstack
Update static override in manifest for ussuri upgrde As ussuri support only python3, we have to add WSGISocketPrefix and specify python-home and socket-usr for WSGIDaemonProcess, otherwise python3 wsgi could not work. story: 2007638 task: 39694 Depends-on: https://review.opendev.org/#/c/712880/ Change-Id: I45c895d09002e3a898d4c01b10dca6acb8ceb415 Signed-off-by: Yu Chengde <yu.chengde@99cloud.com>
This commit is contained in:
parent
c00ff664f1
commit
c754988ee6
|
@ -399,9 +399,10 @@ data:
|
||||||
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
||||||
CustomLog /dev/stdout combined env=!forwarded
|
CustomLog /dev/stdout combined env=!forwarded
|
||||||
CustomLog /dev/stdout proxy env=forwarded
|
CustomLog /dev/stdout proxy env=forwarded
|
||||||
|
WSGISocketPrefix /var/run/httpd/wsgi
|
||||||
|
|
||||||
<VirtualHost *:{{ $portInt }}>
|
<VirtualHost *:{{ $portInt }}>
|
||||||
WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
|
WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP} python-home=/var/lib/openstack socket-user=apache
|
||||||
WSGIProcessGroup keystone-public
|
WSGIProcessGroup keystone-public
|
||||||
WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public
|
WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
|
@ -1176,8 +1177,9 @@ data:
|
||||||
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
||||||
CustomLog /dev/stdout combined env=!forwarded
|
CustomLog /dev/stdout combined env=!forwarded
|
||||||
CustomLog /dev/stdout proxy env=forwarded
|
CustomLog /dev/stdout proxy env=forwarded
|
||||||
|
WSGISocketPrefix /var/run/httpd/wsgi
|
||||||
<VirtualHost *:{{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
<VirtualHost *:{{ tuple "placement" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
||||||
WSGIDaemonProcess placement-api processes=4 threads=1 user=placement group=placement display-name=%{GROUP}
|
WSGIDaemonProcess placement-api processes=4 threads=1 user=placement group=placement display-name=%{GROUP} python-home=/var/lib/openstack socket-user=apache
|
||||||
WSGIProcessGroup placement-api
|
WSGIProcessGroup placement-api
|
||||||
WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api
|
WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
|
@ -1773,9 +1775,10 @@ data:
|
||||||
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
||||||
CustomLog /dev/stdout combined env=!forwarded
|
CustomLog /dev/stdout combined env=!forwarded
|
||||||
CustomLog /dev/stdout proxy env=forwarded
|
CustomLog /dev/stdout proxy env=forwarded
|
||||||
|
WSGISocketPrefix /var/run/httpd/wsgi
|
||||||
|
|
||||||
<VirtualHost *:{{ tuple "alarming" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
<VirtualHost *:{{ tuple "alarming" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
||||||
WSGIDaemonProcess aodh processes=2 threads=1 user=aodh group=aodh display-name=%{GROUP}
|
WSGIDaemonProcess aodh processes=2 threads=1 user=aodh group=aodh display-name=%{GROUP} python-home=/var/lib/openstack socket-user=apache
|
||||||
WSGIProcessGroup aodh
|
WSGIProcessGroup aodh
|
||||||
WSGIScriptAlias / /var/www/cgi-bin/aodh/aodh-api
|
WSGIScriptAlias / /var/www/cgi-bin/aodh/aodh-api
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
|
@ -2038,9 +2041,10 @@ data:
|
||||||
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
||||||
CustomLog /dev/stdout combined env=!forwarded
|
CustomLog /dev/stdout combined env=!forwarded
|
||||||
CustomLog /dev/stdout proxy env=forwarded
|
CustomLog /dev/stdout proxy env=forwarded
|
||||||
|
WSGISocketPrefix /var/run/httpd/wsgi
|
||||||
|
|
||||||
<VirtualHost *:{{ tuple "event" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
<VirtualHost *:{{ tuple "event" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
||||||
WSGIDaemonProcess panko processes=2 threads=1 user=panko group=panko display-name=%{GROUP}
|
WSGIDaemonProcess panko processes=2 threads=1 user=panko group=panko display-name=%{GROUP} python-home=/var/lib/openstack socket-user=apache
|
||||||
WSGIProcessGroup panko
|
WSGIProcessGroup panko
|
||||||
WSGIScriptAlias / /var/www/cgi-bin/panko/panko-api
|
WSGIScriptAlias / /var/www/cgi-bin/panko/panko-api
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
|
@ -2588,10 +2592,11 @@ data:
|
||||||
Listen :::{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
Listen :::{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||||
|
|
||||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
||||||
|
WSGISocketPrefix /var/run/httpd/wsgi
|
||||||
|
|
||||||
<VirtualHost *:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
<VirtualHost *:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
||||||
LogLevel info
|
LogLevel info
|
||||||
WSGIDaemonProcess ceilometer-api processes=2 threads=1 user=ceilometer group=ceilometer display-name=%{GROUP} python-path=/var/lib/kolla/venv/lib/python2.7/site-packages
|
WSGIDaemonProcess ceilometer-api processes=2 threads=1 user=ceilometer group=ceilometer display-name=%{GROUP} python-home=/var/lib/openstack socket-user=apache
|
||||||
WSGIProcessGroup ceilometer-api
|
WSGIProcessGroup ceilometer-api
|
||||||
|
|
||||||
WSGIScriptReloading On
|
WSGIScriptReloading On
|
||||||
|
@ -2766,10 +2771,11 @@ data:
|
||||||
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
|
||||||
CustomLog /dev/stdout combined env=!forwarded
|
CustomLog /dev/stdout combined env=!forwarded
|
||||||
CustomLog /dev/stdout proxy env=forwarded
|
CustomLog /dev/stdout proxy env=forwarded
|
||||||
|
WSGISocketPrefix /var/run/httpd/wsgi
|
||||||
|
|
||||||
<VirtualHost *:{{ tuple "dashboard" "internal" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
<VirtualHost *:{{ tuple "dashboard" "internal" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
||||||
WSGIScriptReloading On
|
WSGIScriptReloading On
|
||||||
WSGIDaemonProcess horizon-http processes=5 threads=1 user=horizon group=horizon display-name=%{GROUP} python-path=/var/lib/kolla/venv/lib/python2.7/site-packages
|
WSGIDaemonProcess horizon-http processes=5 threads=1 user=horizon group=horizon display-name=%{GROUP} python-home=/var/lib/openstack socket-user=apache
|
||||||
WSGIProcessGroup horizon-http
|
WSGIProcessGroup horizon-http
|
||||||
WSGIScriptAlias / /var/www/cgi-bin/horizon/django.wsgi
|
WSGIScriptAlias / /var/www/cgi-bin/horizon/django.wsgi
|
||||||
WSGIPassAuthorization On
|
WSGIPassAuthorization On
|
||||||
|
|
Loading…
Reference in New Issue