Replace wsgi script

pbr is removing support for wsgi_script due to changes in setuptools.
Use the wsgi script module python code instead.

Note that this change only touches CentOS code. Ubuntu and Debian will
be updated later when we bump the release used in our testing.

Change-Id: I8e95cb769c11ef8664403c78e48a89ddc99611a4
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-20 18:31:03 +09:00
parent 083514abb1
commit a8ec5522a1
2 changed files with 4 additions and 2 deletions

View File

@@ -3,6 +3,8 @@
class octavia::params {
include openstacklib::defaults
$pyver3 = $openstacklib::defaults::pyver3
$api_service_name = 'octavia-api'
$worker_service_name = 'octavia-worker'
$health_manager_service_name = 'octavia-health-manager'
@@ -22,7 +24,7 @@ class octavia::params {
$housekeeping_package_name = 'openstack-octavia-housekeeping'
$driver_agent_package_name = 'openstack-octavia-driver-agent'
$octavia_wsgi_script_path = '/var/www/cgi-bin/octavia'
$octavia_wsgi_script_source = '/usr/bin/octavia-wsgi'
$octavia_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/octavia/wsgi/api.py"
$python_redis_package_name = 'python3-redis'
$python_kazoo_package_name = 'python3-kazoo'
$python_etcd3gw_package_name = 'python3-etcd3gw'

View File

@@ -161,7 +161,7 @@ describe 'octavia::wsgi::apache' do
when 'RedHat'
{
:wsgi_script_path => '/var/www/cgi-bin/octavia',
:wsgi_script_source => '/usr/bin/octavia-wsgi',
:wsgi_script_source => '/usr/lib/python3.9/site-packages/octavia/wsgi/api.py',
}
end
end