Unhardocde policy file path
PROD-33618
Change-Id: I4e38b7c8183451e97f1e168d8abe690eca69c318
diff --git a/ironic/api.sls b/ironic/api.sls
index 1afd4b5..46836e3 100644
--- a/ironic/api.sls
+++ b/ironic/api.sls
@@ -71,7 +71,7 @@
- file: /etc/ironic/ironic.conf
- file: /etc/ironic/policy.json
-/etc/ironic/policy.json:
+/etc/ironic/{{ api.get('oslo_policy', {}).get('policy_file', 'policy.json') }}:
file.managed:
- source: salt://ironic/files/{{ api.version }}/policy.json
- template: jinja
diff --git a/ironic/files/queens/ironic.conf b/ironic/files/queens/ironic.conf
index 9e659a1..aed0653 100644
--- a/ironic/files/queens/ironic.conf
+++ b/ironic/files/queens/ironic.conf
@@ -2390,8 +2390,8 @@
{%- endif %}
[oslo_policy]
-{%- if ironic.policy is defined %}
-{%- set _data = ironic.policy %}
+{%- if ironic.oslo_policy is defined %}
+{%- set _data = ironic.oslo_policy %}
{%- include "oslo_templates/files/queens/oslo/_policy.conf" %}
{%- endif %}
diff --git a/ironic/map.jinja b/ironic/map.jinja
index 67a0e13..356f046 100644
--- a/ironic/map.jinja
+++ b/ironic/map.jinja
@@ -29,7 +29,10 @@
'enabled': true
}
}
- }
+ },
+ 'oslo_policy': {
+ 'policy_file': 'policy.json'
+ },
}
}, base='Common', merge=pillar.ironic.get('api', {})) %}