From: Harry Huang <huangxiangyu5@huawei.com>
Date: Thu, 8 Nov 2018 10:49:27 +0000 (+0800)
Subject: Fix controller restart issue
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F64771%2F2;p=compass4nfv.git

Fix controller restart issue

JIRA: COMPASS-620

Configuration for lxcbr0 is missing because
interfaces file is overwritten during setup
of openvswitch. Add configuration of lxcbr0
in setup-openvswitch.

Change-Id: I7eadc3fb9ccfd05608d57c4de0a451ba2dceab60
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2 b/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2
index 315e9fb9..bdc4d447 100755
--- a/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2
@@ -86,3 +86,5 @@ iface br-storage inet static
     bridge_ports {{ intf_storage }}
     address {{ ip_settings[inventory_hostname]["storage"]["ip"] }}
     netmask 255.255.255.0
+
+source /etc/network/interfaces.d/*.cfg