diff --git a/README.rst b/README.rst
index ef03f8b..5a58663 100644
--- a/README.rst
+++ b/README.rst
@@ -1775,6 +1775,21 @@
           protocol: http
 
 
+Set vxlan_group with LinuxBridge Agents
+-------------------------------
+
+.. code-block:: yaml
+
+    neutron:
+      gateway:
+        vxlan:
+          group: 224.0.0.1
+      ....
+      compute:
+        vxlan:
+          group: 224.0.0.1
+
+
 Upgrades
 ========
 
diff --git a/neutron/files/ocata/linuxbridge_agent.ini b/neutron/files/ocata/linuxbridge_agent.ini
index 45db17e..ebdec01 100644
--- a/neutron/files/ocata/linuxbridge_agent.ini
+++ b/neutron/files/ocata/linuxbridge_agent.ini
@@ -195,6 +195,9 @@
 # (24-bit) VNI, use a /8 such as 239.0.0.0/8. This setting must be the same on
 # all the agents. (string value)
 #vxlan_group = 224.0.0.1
+{%- if neutron.get('vxlan', {}).group is defined %}
+vxlan_group = {{ neutron.vxlan.group }}
+{%- endif %}
 
 # IP address of local overlay (tunnel) network endpoint. Use either an IPv4 or
 # IPv6 address that resides on one of the host network interfaces. The IP
diff --git a/neutron/files/pike/linuxbridge_agent.ini b/neutron/files/pike/linuxbridge_agent.ini
index 45db17e..ebdec01 100644
--- a/neutron/files/pike/linuxbridge_agent.ini
+++ b/neutron/files/pike/linuxbridge_agent.ini
@@ -195,6 +195,9 @@
 # (24-bit) VNI, use a /8 such as 239.0.0.0/8. This setting must be the same on
 # all the agents. (string value)
 #vxlan_group = 224.0.0.1
+{%- if neutron.get('vxlan', {}).group is defined %}
+vxlan_group = {{ neutron.vxlan.group }}
+{%- endif %}
 
 # IP address of local overlay (tunnel) network endpoint. Use either an IPv4 or
 # IPv6 address that resides on one of the host network interfaces. The IP
diff --git a/neutron/files/queens/linuxbridge_agent.ini b/neutron/files/queens/linuxbridge_agent.ini
index c0f04d3..ebbaa82 100644
--- a/neutron/files/queens/linuxbridge_agent.ini
+++ b/neutron/files/queens/linuxbridge_agent.ini
@@ -222,6 +222,9 @@
 # (24-bit) VNI, use a /8 such as 239.0.0.0/8. This setting must be the same on
 # all the agents. (string value)
 #vxlan_group = 224.0.0.1
+{%- if neutron.get('vxlan', {}).group is defined %}
+vxlan_group = {{ neutron.vxlan.group }}
+{%- endif %}
 
 # IP address of local overlay (tunnel) network endpoint. Use either an IPv4 or
 # IPv6 address that resides on one of the host network interfaces. The IP