Fix tenant interface type

JIRA: -

In setup-openvswitch role, tenant interface
type is static which will cause failure during
network restart. Set it to manual instead.

Change-Id: Id6fdaa2b7fbae9d8a6d243b43ec35868af4c2fdd
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 f7b9756..315e9fb 100755 (executable)
--- a/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2
@@ -26,7 +26,7 @@ iface {{ intf_external }} inet manual
 {% set intf_tenant = intf_tenant + '.' + contr_sys_mappings["tenant"]["vlan_tag"]|string %}
 {% endif %}
 auto {{ intf_tenant }}
-iface {{ intf_tenant }} inet static
+iface {{ intf_tenant }} inet manual
 {% if contr_sys_mappings["tenant"]["vlan_tag"] | int %}
     vlan-raw-device {{ intf_tenant }}
 {% endif %}