Merge pull request #689 from jpodivin/todoresolution

Resolving TODO conditional nova template rendering

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

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",