From 7b0ea15dbbdb8ba4b6f9fda7c53623e3197bd89c Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Tue, 2 Jul 2024 09:07:43 +0200 Subject: [PATCH] Resolving TODO conditional nova template rendering The situation requiring the conditional implemented in 86502f8bef186b9d7da71c3d927c8752f64a716f has been resolved since merge of 05539a624fcd8baf60dcec6a60c7928edd9f4252 into dataplane-operator. The conditional serves no further purpose and should be safe to remove. Signed-off-by: Jiri Podivin --- roles/edpm_nova/tasks/install.yml | 11 +---------- roles/edpm_nova/templates/nova_compute.json.j2 | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/roles/edpm_nova/tasks/install.yml b/roles/edpm_nova/tasks/install.yml index ceaaff8b9..3761fb773 100644 --- a/roles/edpm_nova/tasks/install.yml +++ b/roles/edpm_nova/tasks/install.yml @@ -5,15 +5,6 @@ path: "{{ edpm_nova_tls_ca_src_dir }}/tls-ca-bundle.pem" register: ca_bundle_stat_res -# TODO(slagle) This is a temporary backwards compatible task so this can merge -# independently of the dataplane-operator change. This can be removed when -# https://github.com/openstack-k8s-operators/dataplane-operator/pull/885 -# merges. Remove the check in templates/nova_compute.json.j2 as well. -- name: Check if nova-custom ca bundle exists - ansible.builtin.stat: - path: "/var/lib/openstack/cacerts/nova-custom/tls-ca-bundle.pem" - register: nova_custom_ca_bundle_stat_res - - name: Render nova container tags: - install @@ -25,9 +16,9 @@ mode: "0644" vars: ca_bundle_exists: "{{ ca_bundle_stat_res.stat.exists }}" - nova_custom_ca_bundle_exists: "{{ nova_custom_ca_bundle_stat_res.stat.exists }}" notify: - Restart nova + - name: Deploy nova container tags: - install diff --git a/roles/edpm_nova/templates/nova_compute.json.j2 b/roles/edpm_nova/templates/nova_compute.json.j2 index 0f95ceae7..136ea50fe 100644 --- a/roles/edpm_nova/templates/nova_compute.json.j2 +++ b/roles/edpm_nova/templates/nova_compute.json.j2 @@ -12,8 +12,6 @@ "/var/lib/openstack/config/nova:/var/lib/kolla/config_files:ro", {% if ca_bundle_exists|bool %} "{{ edpm_nova_tls_ca_src_dir }}/tls-ca-bundle.pem:/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem:ro,z", -{% elif nova_custom_ca_bundle_exists|bool %} - "/var/lib/openstack/cacerts/nova-custom/tls-ca-bundle.pem:/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem:ro,z", {% endif %} "/etc/localtime:/etc/localtime:ro", "/lib/modules:/lib/modules:ro",