Merge "Remove policy file from nova-conductor config.json template"

ansible/roles/nova-cell/templates/nova-conductor.json.j2

@@ -6,13 +6,7 @@
             "dest": "/etc/nova/nova.conf",
             "owner": "nova",
             "perm": "0600"
-        }{% if nova_policy_file is defined %},
-        {
-            "source": "{{ container_config_directory }}/{{ nova_policy_file }}",
-            "dest": "/etc/nova/{{ nova_policy_file }}",
-            "owner": "nova",
-            "perm": "0600"
-        }{% endif %}
+        }
     ],
     "permissions": [
         {

releasenotes/notes/bug-1886170-f76d9d3520ab86ec.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes an incorrect configuration for nova-conductor when a custom Nova
+    policy was applied, preventing the ``nova_conductor`` container from
+    starting successfully. `LP#1886170
+    <https://bugs.launchpad.net/kolla-ansible/+bug/1886170>`__