From b9fc7a416e0d38f9176c4aac0fe3286bf90ceac7 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 27 Apr 2026 13:06:47 +0200 Subject: letsencrypt: Switch webserver image to httpd Switch to httpd image which was introduced for keystone-httpd and is identical to letsencrypt-webserver image. The letsencrypt-webserver image will be removed afterwards in [1]. [1]: https://review.opendev.org/c/openstack/kolla/+/986151 Depends-On: https://review.opendev.org/c/openstack/kolla/+/986377 Change-Id: Ica381670de4b157c97be4089eaeb7fe2f7ba039f Signed-off-by: Michal Nasiadka --- ansible/roles/letsencrypt/defaults/main.yml | 2 +- ansible/roles/letsencrypt/templates/letsencrypt-webserver.json.j2 | 8 ++++++++ zuul.d/scenarios/lets-encrypt.yaml | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ansible/roles/letsencrypt/defaults/main.yml b/ansible/roles/letsencrypt/defaults/main.yml index 05afa1cd9..d78cf3ba2 100644 --- a/ansible/roles/letsencrypt/defaults/main.yml +++ b/ansible/roles/letsencrypt/defaults/main.yml @@ -25,7 +25,7 @@ letsencrypt_lego_image: "{{ docker_image_url }}letsencrypt-lego" letsencrypt_lego_tag: "{{ letsencrypt_tag }}" letsencrypt_lego_image_full: "{{ letsencrypt_lego_image }}:{{ letsencrypt_lego_tag }}" -letsencrypt_webserver_image: "{{ docker_image_url }}letsencrypt-webserver" +letsencrypt_webserver_image: "{{ docker_image_url }}httpd" letsencrypt_webserver_tag: "{{ letsencrypt_tag }}" letsencrypt_webserver_image_full: "{{ letsencrypt_webserver_image }}:{{ letsencrypt_webserver_tag }}" diff --git a/ansible/roles/letsencrypt/templates/letsencrypt-webserver.json.j2 b/ansible/roles/letsencrypt/templates/letsencrypt-webserver.json.j2 index 195c37442..57ad35b88 100644 --- a/ansible/roles/letsencrypt/templates/letsencrypt-webserver.json.j2 +++ b/ansible/roles/letsencrypt/templates/letsencrypt-webserver.json.j2 @@ -1,5 +1,6 @@ {% set letsencrypt_apache_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %} {% set apache_binary = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %} +{% set apache_user = 'www-data' if kolla_base_distro in ['ubuntu', 'debian'] else 'apache' %} { "command": "/usr/sbin/{{ apache_binary }} -DFOREGROUND", @@ -16,5 +17,12 @@ "owner": "root", "perm": "0600" }{% endif %} + ], + "directories": [ + { + "path": "/var/log/kolla/letsencrypt", + "owner": "{{ apache_user }}", + "perm": "0755" + } ] } diff --git a/zuul.d/scenarios/lets-encrypt.yaml b/zuul.d/scenarios/lets-encrypt.yaml index 92fa2b78d..cf89ce335 100644 --- a/zuul.d/scenarios/lets-encrypt.yaml +++ b/zuul.d/scenarios/lets-encrypt.yaml @@ -13,10 +13,11 @@ vars: scenario: lets-encrypt scenario_images_extra: - - ^letsencrypt - ^haproxy - tls_enabled: true + - ^httpd + - ^letsencrypt le_enabled: true + tls_enabled: true - job: name: kolla-ansible-debian-trixie-lets-encrypt -- cgit v1.2.3