Skip to content

Commit f557229

Browse files
markgoddardyoctozepto
authored andcommitted
Fix neutron-ovn-metadata-agent with policy.yaml
The config.json template for neutron-ovn-metadata-agent uses a hard-coded policy file name of policy.json. This prevents use of a policy.yaml file with this service. This patch fixes this. TrivialFix Change-Id: Ib96d68f1dc60a0cbb5b79302c1face9c2272946a (cherry picked from commit 0b13277)
1 parent 6870d56 commit f557229

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

ansible/roles/neutron/templates/neutron-ovn-metadata-agent.json.j2

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
"dest": "/etc/neutron/neutron_ovn_metadata_agent.ini",
1313
"owner": "neutron",
1414
"perm": "0600"
15-
},
16-
{
17-
"source": "{{ container_config_directory }}/policy.json",
18-
"dest": "/etc/neutron/policy.json",
19-
"owner": "neutron",
20-
"perm": "0600",
21-
"optional": true
2215
}
16+
{% if neutron_policy_file is defined %},{
17+
"source": "{{ container_config_directory }}/{{ neutron_policy_file }}",
18+
"dest": "/etc/neutron/{{ neutron_policy_file }}",
19+
"owner": "neutron",
20+
"perm": "0600"
21+
}{% endif %}
2322
],
2423
"permissions": [
2524
{

0 commit comments

Comments
 (0)