diff options
Diffstat (limited to 'xci/playbooks/roles/configure-network/templates')
5 files changed, 47 insertions, 47 deletions
diff --git a/xci/playbooks/roles/configure-network/templates/debian/compute00.interface.j2 b/xci/playbooks/roles/configure-network/templates/debian/compute00.interface.j2 index 6d6a3835..2da12f20 100644 --- a/xci/playbooks/roles/configure-network/templates/debian/compute00.interface.j2 +++ b/xci/playbooks/roles/configure-network/templates/debian/compute00.interface.j2 @@ -5,23 +5,23 @@ auto lo iface lo inet loopback # Physical interface -auto {{ interface }} -iface {{ interface }} inet manual +auto {{ ansible_default_ipv4.interface }} +iface {{ ansible_default_ipv4.interface }} inet manual # Container/Host management VLAN interface -auto {{ interface }}.10 -iface {{ interface }}.10 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.10 +iface {{ ansible_default_ipv4.interface }}.10 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # OpenStack Networking VXLAN (tunnel/overlay) VLAN interface -auto {{ interface }}.30 -iface {{ interface }}.30 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.30 +iface {{ ansible_default_ipv4.interface }}.30 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # Storage network VLAN interface -auto {{ interface }}.20 -iface {{ interface }}.20 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.20 +iface {{ ansible_default_ipv4.interface }}.20 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # Container/Host management bridge auto br-mgmt @@ -29,7 +29,7 @@ iface br-mgmt inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.10 + bridge_ports {{ ansible_default_ipv4.interface }}.10 address {{host_info[inventory_hostname].MGMT_IP}} netmask 255.255.252.0 @@ -39,7 +39,7 @@ iface br-vxlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.30 + bridge_ports {{ ansible_default_ipv4.interface }}.30 address {{host_info[inventory_hostname].VXLAN_IP}} netmask 255.255.252.0 @@ -49,7 +49,7 @@ iface br-vlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }} + bridge_ports {{ ansible_default_ipv4.interface }} address {{host_info[inventory_hostname].VLAN_IP}} netmask 255.255.255.0 gateway 192.168.122.1 @@ -70,6 +70,6 @@ iface br-storage inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.20 + bridge_ports {{ ansible_default_ipv4.interface }}.20 address {{host_info[inventory_hostname].STORAGE_IP}} netmask 255.255.252.0 diff --git a/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 b/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 index b461b201..c540f66e 100644 --- a/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 +++ b/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 @@ -5,23 +5,23 @@ auto lo iface lo inet loopback # Physical interface -auto {{ interface }} -iface {{ interface }} inet manual +auto {{ ansible_default_ipv4.interface }} +iface {{ ansible_default_ipv4.interface }} inet manual # Container/Host management VLAN interface -auto {{ interface }}.10 -iface {{ interface }}.10 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.10 +iface {{ ansible_default_ipv4.interface }}.10 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # OpenStack Networking VXLAN (tunnel/overlay) VLAN interface -auto {{ interface }}.30 -iface {{ interface }}.30 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.30 +iface {{ ansible_default_ipv4.interface }}.30 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # Storage network VLAN interface (optional) -auto {{ interface }}.20 -iface {{ interface }}.20 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.20 +iface {{ ansible_default_ipv4.interface }}.20 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # Container/Host management bridge auto br-mgmt @@ -29,7 +29,7 @@ iface br-mgmt inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.10 + bridge_ports {{ ansible_default_ipv4.interface }}.10 address {{host_info[inventory_hostname].MGMT_IP}} netmask 255.255.252.0 @@ -39,7 +39,7 @@ iface br-vxlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.30 + bridge_ports {{ ansible_default_ipv4.interface }}.30 address {{host_info[inventory_hostname].VXLAN_IP}} netmask 255.255.252.0 @@ -49,7 +49,7 @@ iface br-vlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }} + bridge_ports {{ ansible_default_ipv4.interface }} address {{host_info[inventory_hostname].VLAN_IP}} netmask 255.255.255.0 gateway 192.168.122.1 @@ -69,6 +69,6 @@ iface br-storage inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.20 + bridge_ports {{ ansible_default_ipv4.interface }}.20 address {{host_info[inventory_hostname].STORAGE_IP}} netmask 255.255.252.0 diff --git a/xci/playbooks/roles/configure-network/templates/debian/opnfv.interface.j2 b/xci/playbooks/roles/configure-network/templates/debian/opnfv.interface.j2 index 42826414..03f81dbb 100644 --- a/xci/playbooks/roles/configure-network/templates/debian/opnfv.interface.j2 +++ b/xci/playbooks/roles/configure-network/templates/debian/opnfv.interface.j2 @@ -5,23 +5,23 @@ auto lo iface lo inet loopback # Physical interface -auto {{ interface }} -iface {{ interface }} inet manual +auto {{ ansible_default_ipv4.interface }} +iface {{ ansible_default_ipv4.interface }} inet manual # Container/Host management VLAN interface -auto {{ interface }}.10 -iface {{ interface }}.10 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.10 +iface {{ ansible_default_ipv4.interface }}.10 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # OpenStack Networking VXLAN (tunnel/overlay) VLAN interface -auto {{ interface }}.30 -iface {{ interface }}.30 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.30 +iface {{ ansible_default_ipv4.interface }}.30 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # Storage network VLAN interface (optional) -auto {{ interface }}.20 -iface {{ interface }}.20 inet manual - vlan-raw-device {{ interface }} +auto {{ ansible_default_ipv4.interface }}.20 +iface {{ ansible_default_ipv4.interface }}.20 inet manual + vlan-raw-device {{ ansible_default_ipv4.interface }} # Container/Host management bridge auto br-mgmt @@ -29,7 +29,7 @@ iface br-mgmt inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.10 + bridge_ports {{ ansible_default_ipv4.interface }}.10 address {{host_info[inventory_hostname].MGMT_IP}} netmask 255.255.252.0 @@ -39,7 +39,7 @@ iface br-vxlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.30 + bridge_ports {{ ansible_default_ipv4.interface }}.30 address {{ host_info[inventory_hostname].VXLAN_IP }} netmask 255.255.252.0 @@ -49,7 +49,7 @@ iface br-vlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }} + bridge_ports {{ ansible_default_ipv4.interface }} address {{host_info[inventory_hostname].VLAN_IP}} netmask 255.255.255.0 gateway 192.168.122.1 @@ -61,6 +61,6 @@ iface br-storage inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports {{ interface }}.20 + bridge_ports {{ ansible_default_ipv4.interface }}.20 address {{host_info[inventory_hostname].STORAGE_IP}} netmask 255.255.252.0 diff --git a/xci/playbooks/roles/configure-network/templates/redhat/interface.ifcfg.j2 b/xci/playbooks/roles/configure-network/templates/redhat/interface.ifcfg.j2 index b0dea0f5..a97ad0cf 100644 --- a/xci/playbooks/roles/configure-network/templates/redhat/interface.ifcfg.j2 +++ b/xci/playbooks/roles/configure-network/templates/redhat/interface.ifcfg.j2 @@ -4,7 +4,7 @@ ONBOOT=yes BOOTPROTO=none {% if item.vlan_id is defined %} VLAN=yes -ETHERDEVICE={{ interface }} +ETHERDEVICE={{ ansible_default_ipv4.interface }} VLAN_ID={{ item.vlan_id }} {% endif %} BRIDGE={{ item.bridge }} diff --git a/xci/playbooks/roles/configure-network/templates/suse/suse.interface.j2 b/xci/playbooks/roles/configure-network/templates/suse/suse.interface.j2 index ffa418d4..27b01eb4 100644 --- a/xci/playbooks/roles/configure-network/templates/suse/suse.interface.j2 +++ b/xci/playbooks/roles/configure-network/templates/suse/suse.interface.j2 @@ -1,7 +1,7 @@ STARTMODE='auto' BOOTPROTO='static' {% if item.vlan_id is defined %} -ETHERDEVICE={{ interface }} +ETHERDEVICE={{ ansible_default_ipv4.interface }} VLAN_ID={{ item.vlan_id }} {% endif %} {% if item.bridge_ports is defined %} |