Renaming policy to oslo_policy for oslo_policy temlate
The patch renames policy to oslo policy pillar which had been
created to be used in oslo_policy template.
Change-Id: I659aa5372b5713198ca50f8316a3717c036dca14
Related-PROD: PROD-20918
diff --git a/aodh/files/queens/aodh.conf.Debian b/aodh/files/queens/aodh.conf.Debian
index 475f5f1..826cdbc 100644
--- a/aodh/files/queens/aodh.conf.Debian
+++ b/aodh/files/queens/aodh.conf.Debian
@@ -237,8 +237,8 @@
{%- include "oslo_templates/files/queens/oslo/_healthcheck.conf" %}
[oslo_policy]
-{%- if server.policy is defined %}
-{%- set _data = server.policy %}
+{%- if server.oslo_policy is defined %}
+{%- set _data = server.oslo_policy %}
{%- include "oslo_templates/files/queens/oslo/_policy.conf" %}
{%- endif %}
diff --git a/aodh/map.jinja b/aodh/map.jinja
index ea2ea09..08a214f 100644
--- a/aodh/map.jinja
+++ b/aodh/map.jinja
@@ -8,7 +8,7 @@
'notification': {
'topics': 'notifications'
},
- 'policy': {
+ 'oslo_policy': {
'policy_file': '/etc/aodh/policy.json'
},
'logging': {
@@ -28,7 +28,7 @@
'notification': {
'topics': 'notifications'
},
- 'policy': {
+ 'oslo_policy': {
'policy_file': '/etc/aodh/policy.json'
},
'logging': {