openstack/openstack-helm
Code Issues Proposed changes

Remove option for apache < 2.4

Browse Source 
apache 2.4 was released long time ago and is now available in recent
operating systems.

Change-Id: I7a2bdaf7f0105d444f598581f1b3d5d493a8acfe
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-21 03:42:11 +09:00
parent a4df9c709e
commit ab568db885
16 changed files with 20 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
aodh/values.yaml
View File

@@ -406,10 +406,7 @@ conf:
WSGIProcessGroup aodh WSGIProcessGroup aodh
WSGIScriptAlias / /var/www/cgi-bin/aodh/aodh-api WSGIScriptAlias / /var/www/cgi-bin/aodh/aodh-api
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded

6
ceilometer/values.yaml
View File

@@ -1474,13 +1474,7 @@ conf:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
<Directory "/var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer/api"> <Directory "/var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer/api">
<IfVersion >= 2.4>
Require all granted Require all granted
</IfVersion>
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
</Directory> </Directory>
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined CustomLog /dev/stdout combined

5
horizon/values.yaml
View File

@@ -84,9 +84,6 @@ conf:
logo_splash: logo_splash:
favicon: favicon:
apache: | apache: |
<IfVersion < 2.4>
Listen 0.0.0.0:{{ tuple "dashboard" "internal" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
</IfVersion>
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
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
@@ -114,9 +111,7 @@ conf:
SetHandler static SetHandler static
</Location> </Location>
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
TransferLog /dev/stdout TransferLog /dev/stdout

2
keystone/values.yaml
View File

@@ -794,9 +794,7 @@ conf:
WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded

2
monasca/values.yaml
View File

@@ -258,9 +258,7 @@ conf:
WSGIScriptAlias / /var/www/cgi-bin/monasca/monasca-api-wsgi WSGIScriptAlias / /var/www/cgi-bin/monasca/monasca-api-wsgi
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded

4
values_overrides/cinder/tls.yaml
View File

@@ -43,10 +43,8 @@ conf:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded

8
values_overrides/heat/tls.yaml
View File

@@ -31,10 +31,8 @@ conf:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded
@@ -58,10 +56,8 @@ conf:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded

5
values_overrides/horizon/tls.yaml
View File

@@ -13,9 +13,6 @@ conf:
- ssl - ssl
horizon: horizon:
apache: | apache: |
<IfVersion < 2.4>
Listen 0.0.0.0:{{ tuple "dashboard" "internal" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
</IfVersion>
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
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
@@ -51,9 +48,7 @@ conf:
SetHandler static SetHandler static
</Location> </Location>
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
TransferLog /dev/stdout TransferLog /dev/stdout

2
values_overrides/keystone/tls.yaml
View File

@@ -44,9 +44,7 @@ conf:
WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded

8
values_overrides/nova/tls.yaml
View File

@@ -34,10 +34,8 @@ conf:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded
@@ -60,10 +58,8 @@ conf:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded

8
values_overrides/openstack/heat/tls.yaml
View File

@@ -32,10 +32,8 @@ heat:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded
@@ -59,10 +57,8 @@ heat:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded

5
values_overrides/openstack/horizon/tls.yaml
View File

@@ -14,9 +14,6 @@ horizon:
- ssl - ssl
horizon: horizon:
apache: | apache: |
<IfVersion < 2.4>
Listen 0.0.0.0:{{ tuple "dashboard" "internal" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
</IfVersion>
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
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
@@ -52,9 +49,7 @@ horizon:
SetHandler static SetHandler static
</Location> </Location>
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
TransferLog /dev/stdout TransferLog /dev/stdout

2
values_overrides/openstack/keystone/tls.yaml
View File

@@ -46,9 +46,7 @@ keystone:
WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded

8
values_overrides/openstack/nova/tls.yaml
View File

@@ -35,10 +35,8 @@ nova:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded
@@ -61,10 +59,8 @@ nova:
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLogFormat "%{cu}t %M"
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout proxy env=forwarded

2
values_overrides/openstack/placement/tls.yaml
View File

@@ -27,9 +27,7 @@ placement:
WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /dev/stdout ErrorLog /dev/stdout
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded

2
values_overrides/placement/tls.yaml
View File

@@ -28,9 +28,7 @@ conf:
WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion>
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLog /dev/stdout ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout combined env=!forwarded