openstack/kolla-ansible
Code Issues Proposed changes

CI: rocky9 - add to multiple if base_distro statements

Browse Source 
Change-Id: Ib068117237a199db380fcdfb757d5d0e5d34326b
This commit is contained in:
Michal Nasiadka 2022-09-28 14:04:24 +02:00
parent 6bff120d2d
commit 9d5f9080da
11 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/cinder/templates/cinder-wsgi.conf.j2
View File

@ -1,5 +1,5 @@
{% if cinder_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

2
ansible/roles/heat/templates/wsgi-heat-api-cfn.conf.j2
View File

@ -1,7 +1,7 @@
{% set heat_log_dir = '/var/log/kolla/heat' %}
{% set binary_path = '/var/lib/kolla/venv/bin' %}
{% if heat_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

2
ansible/roles/heat/templates/wsgi-heat-api.conf.j2
View File

@ -1,7 +1,7 @@
{% set heat_log_dir = '/var/log/kolla/heat' %}
{% set binary_path = '/var/lib/kolla/venv/bin' %}
{% if heat_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

2
ansible/roles/horizon/templates/horizon.conf.j2
View File

@ -1,7 +1,7 @@
{% set python_path = '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %}
{% if horizon_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

2
ansible/roles/ironic/templates/ironic-api-wsgi.conf.j2
View File

@ -1,7 +1,7 @@
{% set ironic_log_dir = '/var/log/kolla/ironic' %}
{% set wsgi_directory = '/var/lib/kolla/venv/bin' %}
{% if ironic_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

11
ansible/roles/ironic/templates/ironic-tftp.json.j2
View File

@ -1,4 +1,13 @@
{% set pxe_dir = ('/var/lib/ironic/tftpboot/grub' if kolla_base_distro in ['ubuntu', 'debian'] else '/var/lib/ironic/tftpboot/EFI/centos') if enable_ironic_pxe_uefi | bool else '/var/lib/ironic/tftpboot/pxelinux.cfg' %}
{% if enable_ironic_pxe_uefi | bool %}
{% if kolla_base_distro in ['debian', 'ubuntu'] %}
{% set pxe_dir = '/var/lib/ironic/tftpboot/grub' %}
{% elif kolla_base_distro in ['centos', 'rocky'] %}
{% set pxe_dir = '/var/lib/ironic/tftpboot/EFI/{{ kolla_base_distro }}' %}
{% endif %}
{% else %}
{% set pxe_dir = '/var/lib/ironic/tftpboot/pxelinux.cfg' %}
{% endif %}
{% set pxe_cfg = 'grub.cfg' if enable_ironic_pxe_uefi | bool else 'default' %}
{

2
ansible/roles/keystone/templates/wsgi-keystone.conf.j2
View File

@ -1,7 +1,7 @@
{% set keystone_log_dir = '/var/log/kolla/keystone' %}
{% set binary_path = '/var/lib/kolla/venv/bin' %}
{% if keystone_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

2
ansible/roles/nova/templates/nova-api-wsgi.conf.j2
View File

@ -1,7 +1,7 @@
{% set nova_log_dir = '/var/log/kolla/nova' %}
{% set wsgi_directory = '/var/lib/kolla/venv/bin' %}
{% if nova_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

2
ansible/roles/octavia/templates/octavia-wsgi.conf.j2
View File

@ -1,6 +1,6 @@
{% set wsgi_directory = '/var/lib/kolla/venv/bin' %}
{% if octavia_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

2
ansible/roles/placement/templates/placement-api-wsgi.conf.j2
View File

@ -1,7 +1,7 @@
{% set log_dir = '/var/log/kolla/placement' %}
{% set wsgi_directory = '/var/lib/kolla/venv/bin' %}
{% if placement_enable_tls_backend | bool %}
{% if kolla_base_distro in ['centos'] %}
{% if kolla_base_distro in ['centos', 'rocky'] %}
LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
{% else %}
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so

4
tests/templates/globals-default.j2
View File

@ -141,10 +141,10 @@ kolla_enable_tls_external: "yes"
kolla_enable_tls_internal: "yes"
kolla_copy_ca_into_containers: "yes"
kolla_enable_tls_backend: "yes"
{% if base_distro == "ubuntu" or base_distro == "debian" %}
{% if base_distro in ["debian", "ubuntu"] %}
openstack_cacert: "/etc/ssl/certs/ca-certificates.crt"
{% endif %}
{% if base_distro == "centos" %}
{% if base_distro in ["centos", "rocky"] %}
openstack_cacert: "/etc/pki/tls/certs/ca-bundle.crt"
{% endif %}
kolla_admin_openrc_cacert: "{% raw %}{{ kolla_certificates_dir }}{% endraw %}/ca/root.crt"