diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-05-10 08:46:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-10 08:46:11 +0000 |
| commit | 729a1cc3924f0fb33e00bfebe1f7bfda05606578 (patch) | |
| tree | a81e0cbfec8cde8afd69a9043a362b7a84b6465f /deploy/adapters/ansible/roles/config-controller/templates/controller.j2 | |
| parent | aedfece7bd93b01e58ce51248c437ee9e2565f51 (diff) | |
| parent | 1f9ff3030c19d60cb6c639cde8b394994da892f0 (diff) | |
Merge "Upgrade OpenStack version from Pike to Queens"
Diffstat (limited to 'deploy/adapters/ansible/roles/config-controller/templates/controller.j2')
| -rwxr-xr-x | deploy/adapters/ansible/roles/config-controller/templates/controller.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 b/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 index 4e444eca..ae654b47 100755 --- a/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 +++ b/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 @@ -71,11 +71,13 @@ iface br-external inet static # bridge. # auto br-tenant -iface br-tenant inet manual +iface br-tenant inet static bridge_stp off bridge_waitport 0 bridge_fd 0 bridge_ports {{ intf_tenant }} + address {{ ip_settings[inventory_hostname]["tenant"]["ip"] }} + netmask 255.255.255.0 # Storage bridge auto br-storage |