From 2c786a0faf3895e917305cdfc3885134b220daed Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 9 Aug 2021 09:21:46 +0100 Subject: [PATCH] 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 --- ansible/roles/neutron/templates/neutron-server.json.j2 | 2 +- releasenotes/notes/fix-neutron-vmware-4a8804399d47d8d7.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-neutron-vmware-4a8804399d47d8d7.yaml diff --git a/ansible/roles/neutron/templates/neutron-server.json.j2 b/ansible/roles/neutron/templates/neutron-server.json.j2 index ba41a52f99..30bb11f49c 100644 --- a/ansible/roles/neutron/templates/neutron-server.json.j2 +++ b/ansible/roles/neutron/templates/neutron-server.json.j2 @@ -26,7 +26,7 @@ "owner": "neutron", "optional": {{ (neutron_plugin_agent not in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_dvs']) | string | lower }}, "perm": "0600" - }{% endif %} + },{% endif %} {% if check_extra_ml2_plugins is defined and check_extra_ml2_plugins.matched > 0 %}{% for plugin in check_extra_ml2_plugins.files %} { "source": "{{ container_config_directory }}/{{ plugin.path | basename }}", diff --git a/releasenotes/notes/fix-neutron-vmware-4a8804399d47d8d7.yaml b/releasenotes/notes/fix-neutron-vmware-4a8804399d47d8d7.yaml new file mode 100644 index 0000000000..4944b18856 --- /dev/null +++ b/releasenotes/notes/fix-neutron-vmware-4a8804399d47d8d7.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes an issue with ``config.json`` for ``neutron-server`` when a VMware + plugin agent is used.