diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-03-30 14:11:59 +0200 |
|---|---|---|
| committer |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
| commit | 212db4ee0e1941c7dd73569c5b7369c96f7a8752 (patch) | |
| tree | 9e7869993da15bfcff98c5646373c31f5486a553 /xci/template/compute.interface.j2 | |
| parent | f0c60234bd35f4dd864d058dab71d0dd4ab4bced (diff) | |
xci: Networking fixes to introduce role and interface var
Network configuration task and accompanied handler put into a role
and handler is converted to task.
Distro specific var, interface, is introduced to ensure we do not
hardcode the interface which might not be available.
Update the templates accordingly.
Change-Id: I667620fe22c93a9b20a1d8c1b7b0051d7647b591
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'xci/template/compute.interface.j2')
| -rw-r--r-- | xci/template/compute.interface.j2 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/xci/template/compute.interface.j2 b/xci/template/compute.interface.j2 index 1719f6a0..0c5147c4 100644 --- a/xci/template/compute.interface.j2 +++ b/xci/template/compute.interface.j2 @@ -7,23 +7,23 @@ iface lo inet loopback # Physical interface -auto ens3 -iface ens3 inet manual +auto {{ interface }} +iface {{ interface }} inet manual # Container/Host management VLAN interface -auto ens3.10 -iface ens3.10 inet manual - vlan-raw-device ens3 +auto {{ interface }}.10 +iface {{ interface }}.10 inet manual + vlan-raw-device {{ interface }} # OpenStack Networking VXLAN (tunnel/overlay) VLAN interface -auto ens3.30 -iface ens3.30 inet manual - vlan-raw-device ens3 +auto {{ interface }}.30 +iface {{ interface }}.30 inet manual + vlan-raw-device {{ interface }} # Storage network VLAN interface (optional) -auto ens3.20 -iface ens3.20 inet manual - vlan-raw-device ens3 +auto {{ interface }}.20 +iface {{ interface }}.20 inet manual + vlan-raw-device {{ interface }} # Container/Host management bridge auto br-mgmt @@ -31,7 +31,7 @@ iface br-mgmt inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports ens3.10 + bridge_ports {{ interface }}.10 address {{host_info[inventory_hostname].MGMT_IP}} netmask 255.255.252.0 @@ -41,7 +41,7 @@ iface br-vxlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports ens3.30 + bridge_ports {{ interface }}.30 address {{host_info[inventory_hostname].VXLAN_IP}} netmask 255.255.252.0 @@ -51,7 +51,7 @@ iface br-vlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports ens3 + bridge_ports {{ interface }} address {{host_info[inventory_hostname].VLAN_IP}} netmask 255.255.255.0 gateway 192.168.122.1 @@ -81,6 +81,6 @@ iface br-storage inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports ens3.20 + bridge_ports {{ interface }}.20 address {{host_info[inventory_hostname].STORAGE_IP}} netmask 255.255.252.0 |