commit 63de8e0798286b1b8379f5b25ed8ac527dc6183e
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Dec 24 10:29:26 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Dec 24 10:29:26 2018 +0000
tree 5f21a2715324367641e32e7000a6a9c83f103b42
parent 7af3fa0b1e52a6e1a761925076c9949b2b5ac1ef
parent 81219a323996e946949aacafb7fdec092a33bec6

Merge "Remove workaround for xmpp connection issue with OC4.1"

opencontrail/files/4.0/contrail-vrouter-agent.conf

diff --git a/opencontrail/files/4.0/contrail-vrouter-agent.conf b/opencontrail/files/4.0/contrail-vrouter-agent.conf
index 7110ce9..a0a742b 100644
--- a/opencontrail/files/4.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/4.0/contrail-vrouter-agent.conf
@@ -233,10 +233,8 @@
 # name of virtual host interface
 name=vhost0
 
-{%- if compute.version < 4.1 %}
 # IP address and prefix in ip/prefix_len format
 ip={{ compute.interface.address }}/{{ compute.interface.mask }}
-{%- endif %}
 
 # Gateway IP address for virtual host
 gateway={{ compute.interface.gateway }}