diff options
| author | Zuul <zuul@review.opendev.org> | 2026-05-06 06:00:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-05-06 06:00:22 +0000 |
| commit | f58a94eec0561f3d7dbdb76178f31219a9d207cf (patch) | |
| tree | 954f262293fa3b0831085a2519f79cef29e960af | |
| parent | 864d242bf83331e4744da4e93394f8bcd7f97262 (diff) | |
| parent | b9fc7a416e0d38f9176c4aac0fe3286bf90ceac7 (diff) | |
| download | kolla-ansible-f58a94eec0561f3d7dbdb76178f31219a9d207cf.tar.gz kolla-ansible-f58a94eec0561f3d7dbdb76178f31219a9d207cf.zip | |
Merge "letsencrypt: Switch webserver image to httpd"
| -rw-r--r-- | ansible/roles/letsencrypt/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/letsencrypt/templates/letsencrypt-webserver.json.j2 | 8 | ||||
| -rw-r--r-- | 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 |