Only implement policy.json if an override is configured

With I6a61079da4d4f5080ee32d640144e6bdb14735fa merged there
is no longer a default policy.json file in the venv, so we
need to change how we implement the file, and should only do
so if there is a config override configured for it.

Change-Id: Ia4808a845dbb6d80c316a5e63fdc037ae1e2811e
This commit is contained in:
Jesse Pretorius 2018-12-17 10:58:29 +00:00 committed by Jesse Pretorius (odyssey4me)
parent c8cc9a7bd2
commit 10dedbe9ce
2 changed files with 7 additions and 4 deletions

View File

@ -63,6 +63,13 @@
notify:
- Restart neutron services
- name: Implement policy.json if there are overrides configured
copy:
content: "{{ neutron_policy_overrides | to_nice_json }}"
dest: "{{ neutron_conf_dir }}/policy.json"
when:
- neutron_policy_overrides != {}
- name: Place api-paste.ini to the correct path in RedHat
file:
src: "/usr/share/neutron/api-paste.ini"

View File

@ -547,7 +547,3 @@ neutron_core_files:
owner: "root"
group: "{{ neutron_system_group_name }}"
mode: "0640"
- tmp_f: "/tmp/policy.json.original"
target_f: "{{ neutron_conf_dir }}/policy.json"
config_overrides: "{{ neutron_policy_overrides }}"
config_type: "json"