diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-08-23 07:41:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-23 07:41:27 +0000 |
| commit | de13fb1b0158c726f84356e3d095229da6b9114f (patch) | |
| tree | a681b986e45b21dc2ae478654eed882a86b734f9 | |
| parent | 6d6562461a5faae955dedb1c365cb4b21a60d516 (diff) | |
| parent | ae40683e9405de2a8d185c1da94bcffe2b2695b6 (diff) | |
Merge "Fix tenant interface type"
| -rwxr-xr-x | deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2 b/deploy/adapters/ansible/roles/setup-openvswitch/templates/controller.j2 index f7b9756b..315e9fb9 100755 --- 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 %} |