Skip to content

Commit 0e5f0b0

Browse files
markgoddardyoctozepto
authored andcommitted
neutron: fix neutron-server config.json with VMware
Missing comma in config.json template rendered invalid JSON with VMware plugin agent. Closes-Bug: #1939080 Change-Id: I3d0c6421e3da7e1e753b99cf87c32fc238a21523 (cherry picked from commit 2c786a0)
1 parent c73be00 commit 0e5f0b0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ansible/roles/neutron/templates/neutron-server.json.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"owner": "neutron",
2727
"optional": {{ (neutron_plugin_agent not in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_dvs']) | string | lower }},
2828
"perm": "0600"
29-
}{% endif %}
29+
},{% endif %}
3030
{% if check_extra_ml2_plugins is defined and check_extra_ml2_plugins.matched > 0 %}{% for plugin in check_extra_ml2_plugins.files %}
3131
{
3232
"source": "{{ container_config_directory }}/{{ plugin.path | basename }}",
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue with ``config.json`` for ``neutron-server`` when a VMware
5+
plugin agent is used.

0 commit comments

Comments
 (0)