aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-11-08 18:49:27 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-12-04 01:51:33 +0000
commit78a321d9c23d42a955efe76e10785e0afefac70d (patch)
tree30ed02b4fd5b7e3307bd2b16f6d0a1266fecb8ac
parentbb7fc0344ed6e15f03a35c822478a898ccb95947 (diff)
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> (cherry picked from commit 102bb6775c60fefca3c88d6f582f520384636f9f)
-rwxr-xr-xdeploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2 b/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2
index 315e9fb..bdc4d44 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