From 8503b6c31989c1b290f3c81953410415265965d1 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Mon, 19 Mar 2018 07:41:50 -0700 Subject: Move configuration network templates The jinja templates that are used for networking setup are based on the openstack-ansible needs, those needs can differ for another installers. This change propose to make the network configuration depending on the installer. Signed-off-by: Victor Morales Change-Id: Ie805c3c7716393377d4dfcb32ed794cc1039d515 --- .../templates/debian/compute00.interface.j2 | 75 ---------------------- .../templates/debian/compute01.interface.j2 | 1 - .../templates/debian/controller00.interface.j2 | 74 --------------------- .../templates/debian/controller01.interface.j2 | 1 - .../templates/debian/controller02.interface.j2 | 1 - .../templates/debian/opnfv.interface.j2 | 66 ------------------- .../templates/osa/debian/compute00.interface.j2 | 75 ++++++++++++++++++++++ .../templates/osa/debian/compute01.interface.j2 | 1 + .../templates/osa/debian/controller00.interface.j2 | 74 +++++++++++++++++++++ .../templates/osa/debian/controller01.interface.j2 | 1 + .../templates/osa/debian/controller02.interface.j2 | 1 + .../templates/osa/debian/opnfv.interface.j2 | 66 +++++++++++++++++++ .../templates/osa/redhat/bridge.ifcfg.j2 | 9 +++ .../templates/osa/redhat/interface.ifcfg.j2 | 10 +++ .../templates/osa/suse/suse.interface.j2 | 17 +++++ .../templates/osa/suse/suse.routes.j2 | 1 + .../templates/redhat/bridge.ifcfg.j2 | 9 --- .../templates/redhat/interface.ifcfg.j2 | 10 --- .../templates/suse/suse.interface.j2 | 17 ----- .../bootstrap-host/templates/suse/suse.routes.j2 | 1 - 20 files changed, 255 insertions(+), 255 deletions(-) delete mode 100644 xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 delete mode 120000 xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2 delete mode 100644 xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 delete mode 120000 xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2 delete mode 120000 xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 delete mode 100644 xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 create mode 100644 xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute00.interface.j2 create mode 120000 xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute01.interface.j2 create mode 100644 xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller00.interface.j2 create mode 120000 xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller01.interface.j2 create mode 120000 xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller02.interface.j2 create mode 100644 xci/playbooks/roles/bootstrap-host/templates/osa/debian/opnfv.interface.j2 create mode 100644 xci/playbooks/roles/bootstrap-host/templates/osa/redhat/bridge.ifcfg.j2 create mode 100644 xci/playbooks/roles/bootstrap-host/templates/osa/redhat/interface.ifcfg.j2 create mode 100644 xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.interface.j2 create mode 100644 xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.routes.j2 delete mode 100644 xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 delete mode 100644 xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 delete mode 100644 xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 delete mode 100644 xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2 (limited to 'xci/playbooks/roles/bootstrap-host/templates') diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 deleted file mode 100644 index 2da12f20..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 +++ /dev/null @@ -1,75 +0,0 @@ -# {{ ansible_managed }} - -# The loopback network interface -auto lo -iface lo inet loopback - -# Physical interface -auto {{ ansible_default_ipv4.interface }} -iface {{ ansible_default_ipv4.interface }} inet manual - -# Container/Host management VLAN 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 {{ 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 {{ 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 -iface br-mgmt inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }}.10 - address {{host_info[inventory_hostname].MGMT_IP}} - netmask 255.255.252.0 - -# compute1 VXLAN (tunnel/overlay) bridge config -auto br-vxlan -iface br-vxlan inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }}.30 - address {{host_info[inventory_hostname].VXLAN_IP}} - netmask 255.255.252.0 - -# OpenStack Networking VLAN bridge -auto br-vlan -iface br-vlan inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }} - address {{host_info[inventory_hostname].VLAN_IP}} - netmask 255.255.255.0 - gateway 192.168.122.1 - dns-nameserver 8.8.8.8 8.8.4.4 - offload-sg off - # Create veth pair, don't bomb if already exists - pre-up ip link add br-vlan-veth type veth peer name eth12 || true - # Set both ends UP - pre-up ip link set br-vlan-veth up - pre-up ip link set eth12 up - # Delete veth pair on DOWN - post-down ip link del br-vlan-veth || true - bridge_ports br-vlan-veth - -# OpenStack Storage bridge -auto br-storage -iface br-storage inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - 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/bootstrap-host/templates/debian/compute01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2 deleted file mode 120000 index a74df1c2..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2 +++ /dev/null @@ -1 +0,0 @@ -compute00.interface.j2 \ No newline at end of file diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 deleted file mode 100644 index c540f66e..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 +++ /dev/null @@ -1,74 +0,0 @@ -# {{ ansible_managed }} - -# The loopback network interface -auto lo -iface lo inet loopback - -# Physical interface -auto {{ ansible_default_ipv4.interface }} -iface {{ ansible_default_ipv4.interface }} inet manual - -# Container/Host management VLAN 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 {{ 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 {{ 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 -iface br-mgmt inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }}.10 - address {{host_info[inventory_hostname].MGMT_IP}} - netmask 255.255.252.0 - -# OpenStack Networking VXLAN (tunnel/overlay) bridge -auto br-vxlan -iface br-vxlan inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }}.30 - address {{host_info[inventory_hostname].VXLAN_IP}} - netmask 255.255.252.0 - -# OpenStack Networking VLAN bridge -auto br-vlan -iface br-vlan inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }} - address {{host_info[inventory_hostname].VLAN_IP}} - netmask 255.255.255.0 - gateway 192.168.122.1 - dns-nameserver 8.8.8.8 8.8.4.4 - # Create veth pair, don't bomb if already exists - pre-up ip link add br-vlan-veth type veth peer name eth12 || true - # Set both ends UP - pre-up ip link set br-vlan-veth up - pre-up ip link set eth12 up - # Delete veth pair on DOWN - post-down ip link del br-vlan-veth || true - bridge_ports br-vlan-veth - -# OpenStack Storage bridge -auto br-storage -iface br-storage inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - 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/bootstrap-host/templates/debian/controller01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2 deleted file mode 120000 index e835d7ca..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2 +++ /dev/null @@ -1 +0,0 @@ -controller00.interface.j2 \ No newline at end of file diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 deleted file mode 120000 index e835d7ca..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 +++ /dev/null @@ -1 +0,0 @@ -controller00.interface.j2 \ No newline at end of file diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 deleted file mode 100644 index 03f81dbb..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 +++ /dev/null @@ -1,66 +0,0 @@ -# {{ ansible_managed }} - -# The loopback network interface -auto lo -iface lo inet loopback - -# Physical interface -auto {{ ansible_default_ipv4.interface }} -iface {{ ansible_default_ipv4.interface }} inet manual - -# Container/Host management VLAN 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 {{ 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 {{ 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 -iface br-mgmt inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }}.10 - address {{host_info[inventory_hostname].MGMT_IP}} - netmask 255.255.252.0 - -# OpenStack Networking VXLAN (tunnel/overlay) bridge -auto br-vxlan -iface br-vxlan inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }}.30 - address {{ host_info[inventory_hostname].VXLAN_IP }} - netmask 255.255.252.0 - -# OpenStack Networking VLAN bridge -auto br-vlan -iface br-vlan inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - bridge_ports {{ ansible_default_ipv4.interface }} - address {{host_info[inventory_hostname].VLAN_IP}} - netmask 255.255.255.0 - gateway 192.168.122.1 - dns-nameserver 8.8.8.8 8.8.4.4 - -# OpenStack Storage bridge -auto br-storage -iface br-storage inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - 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/bootstrap-host/templates/osa/debian/compute00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute00.interface.j2 new file mode 100644 index 00000000..2da12f20 --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute00.interface.j2 @@ -0,0 +1,75 @@ +# {{ ansible_managed }} + +# The loopback network interface +auto lo +iface lo inet loopback + +# Physical interface +auto {{ ansible_default_ipv4.interface }} +iface {{ ansible_default_ipv4.interface }} inet manual + +# Container/Host management VLAN 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 {{ 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 {{ 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 +iface br-mgmt inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }}.10 + address {{host_info[inventory_hostname].MGMT_IP}} + netmask 255.255.252.0 + +# compute1 VXLAN (tunnel/overlay) bridge config +auto br-vxlan +iface br-vxlan inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }}.30 + address {{host_info[inventory_hostname].VXLAN_IP}} + netmask 255.255.252.0 + +# OpenStack Networking VLAN bridge +auto br-vlan +iface br-vlan inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }} + address {{host_info[inventory_hostname].VLAN_IP}} + netmask 255.255.255.0 + gateway 192.168.122.1 + dns-nameserver 8.8.8.8 8.8.4.4 + offload-sg off + # Create veth pair, don't bomb if already exists + pre-up ip link add br-vlan-veth type veth peer name eth12 || true + # Set both ends UP + pre-up ip link set br-vlan-veth up + pre-up ip link set eth12 up + # Delete veth pair on DOWN + post-down ip link del br-vlan-veth || true + bridge_ports br-vlan-veth + +# OpenStack Storage bridge +auto br-storage +iface br-storage inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + 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/bootstrap-host/templates/osa/debian/compute01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute01.interface.j2 new file mode 120000 index 00000000..a74df1c2 --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute01.interface.j2 @@ -0,0 +1 @@ +compute00.interface.j2 \ No newline at end of file diff --git a/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller00.interface.j2 new file mode 100644 index 00000000..c540f66e --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller00.interface.j2 @@ -0,0 +1,74 @@ +# {{ ansible_managed }} + +# The loopback network interface +auto lo +iface lo inet loopback + +# Physical interface +auto {{ ansible_default_ipv4.interface }} +iface {{ ansible_default_ipv4.interface }} inet manual + +# Container/Host management VLAN 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 {{ 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 {{ 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 +iface br-mgmt inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }}.10 + address {{host_info[inventory_hostname].MGMT_IP}} + netmask 255.255.252.0 + +# OpenStack Networking VXLAN (tunnel/overlay) bridge +auto br-vxlan +iface br-vxlan inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }}.30 + address {{host_info[inventory_hostname].VXLAN_IP}} + netmask 255.255.252.0 + +# OpenStack Networking VLAN bridge +auto br-vlan +iface br-vlan inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }} + address {{host_info[inventory_hostname].VLAN_IP}} + netmask 255.255.255.0 + gateway 192.168.122.1 + dns-nameserver 8.8.8.8 8.8.4.4 + # Create veth pair, don't bomb if already exists + pre-up ip link add br-vlan-veth type veth peer name eth12 || true + # Set both ends UP + pre-up ip link set br-vlan-veth up + pre-up ip link set eth12 up + # Delete veth pair on DOWN + post-down ip link del br-vlan-veth || true + bridge_ports br-vlan-veth + +# OpenStack Storage bridge +auto br-storage +iface br-storage inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + 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/bootstrap-host/templates/osa/debian/controller01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller01.interface.j2 new file mode 120000 index 00000000..e835d7ca --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller01.interface.j2 @@ -0,0 +1 @@ +controller00.interface.j2 \ No newline at end of file diff --git a/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller02.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller02.interface.j2 new file mode 120000 index 00000000..e835d7ca --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller02.interface.j2 @@ -0,0 +1 @@ +controller00.interface.j2 \ No newline at end of file diff --git a/xci/playbooks/roles/bootstrap-host/templates/osa/debian/opnfv.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/opnfv.interface.j2 new file mode 100644 index 00000000..03f81dbb --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/opnfv.interface.j2 @@ -0,0 +1,66 @@ +# {{ ansible_managed }} + +# The loopback network interface +auto lo +iface lo inet loopback + +# Physical interface +auto {{ ansible_default_ipv4.interface }} +iface {{ ansible_default_ipv4.interface }} inet manual + +# Container/Host management VLAN 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 {{ 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 {{ 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 +iface br-mgmt inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }}.10 + address {{host_info[inventory_hostname].MGMT_IP}} + netmask 255.255.252.0 + +# OpenStack Networking VXLAN (tunnel/overlay) bridge +auto br-vxlan +iface br-vxlan inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }}.30 + address {{ host_info[inventory_hostname].VXLAN_IP }} + netmask 255.255.252.0 + +# OpenStack Networking VLAN bridge +auto br-vlan +iface br-vlan inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + bridge_ports {{ ansible_default_ipv4.interface }} + address {{host_info[inventory_hostname].VLAN_IP}} + netmask 255.255.255.0 + gateway 192.168.122.1 + dns-nameserver 8.8.8.8 8.8.4.4 + +# OpenStack Storage bridge +auto br-storage +iface br-storage inet static + bridge_stp off + bridge_waitport 0 + bridge_fd 0 + 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/bootstrap-host/templates/osa/redhat/bridge.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/bridge.ifcfg.j2 new file mode 100644 index 00000000..06b5f177 --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/bridge.ifcfg.j2 @@ -0,0 +1,9 @@ +DEVICE={{ item.name }} +NM_CONTROLLED=no +IPADDR={{ item.ip }} +PREFIX={{ item.prefix }} +ONBOOT=yes +BOOTPROTO=none +TYPE=Bridge +DELAY=0 +STP=off diff --git a/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/interface.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/interface.ifcfg.j2 new file mode 100644 index 00000000..a97ad0cf --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/interface.ifcfg.j2 @@ -0,0 +1,10 @@ +DEVICE={{ item.name }} +NM_CONTROLLED=no +ONBOOT=yes +BOOTPROTO=none +{% if item.vlan_id is defined %} +VLAN=yes +ETHERDEVICE={{ ansible_default_ipv4.interface }} +VLAN_ID={{ item.vlan_id }} +{% endif %} +BRIDGE={{ item.bridge }} diff --git a/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.interface.j2 new file mode 100644 index 00000000..27b01eb4 --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.interface.j2 @@ -0,0 +1,17 @@ +STARTMODE='auto' +BOOTPROTO='static' +{% if item.vlan_id is defined %} +ETHERDEVICE={{ ansible_default_ipv4.interface }} +VLAN_ID={{ item.vlan_id }} +{% endif %} +{% if item.bridge_ports is defined %} +BRIDGE='yes' +BRIDGE_FORWARDDELAY='0' +BRIDGE_STP=off +BRIDGE_PORTS={{ item.bridge_ports }} +{% endif %} +{% if item.ip is defined %} +IPADDR={{ item.ip }} +{% endif %} +PRE_UP_SCRIPT="compat:suse:network-config-suse" +POST_DOWN_SCRIPT="compat:suse:network-config-suse" diff --git a/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.routes.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.routes.j2 new file mode 100644 index 00000000..7c868447 --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.routes.j2 @@ -0,0 +1 @@ +{{ item.route }} {{ item.gateway }} diff --git a/xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 deleted file mode 100644 index 06b5f177..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 +++ /dev/null @@ -1,9 +0,0 @@ -DEVICE={{ item.name }} -NM_CONTROLLED=no -IPADDR={{ item.ip }} -PREFIX={{ item.prefix }} -ONBOOT=yes -BOOTPROTO=none -TYPE=Bridge -DELAY=0 -STP=off diff --git a/xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 deleted file mode 100644 index a97ad0cf..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 +++ /dev/null @@ -1,10 +0,0 @@ -DEVICE={{ item.name }} -NM_CONTROLLED=no -ONBOOT=yes -BOOTPROTO=none -{% if item.vlan_id is defined %} -VLAN=yes -ETHERDEVICE={{ ansible_default_ipv4.interface }} -VLAN_ID={{ item.vlan_id }} -{% endif %} -BRIDGE={{ item.bridge }} diff --git a/xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 deleted file mode 100644 index 27b01eb4..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 +++ /dev/null @@ -1,17 +0,0 @@ -STARTMODE='auto' -BOOTPROTO='static' -{% if item.vlan_id is defined %} -ETHERDEVICE={{ ansible_default_ipv4.interface }} -VLAN_ID={{ item.vlan_id }} -{% endif %} -{% if item.bridge_ports is defined %} -BRIDGE='yes' -BRIDGE_FORWARDDELAY='0' -BRIDGE_STP=off -BRIDGE_PORTS={{ item.bridge_ports }} -{% endif %} -{% if item.ip is defined %} -IPADDR={{ item.ip }} -{% endif %} -PRE_UP_SCRIPT="compat:suse:network-config-suse" -POST_DOWN_SCRIPT="compat:suse:network-config-suse" diff --git a/xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2 b/xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2 deleted file mode 100644 index 7c868447..00000000 --- a/xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ item.route }} {{ item.gateway }} -- cgit 1.2.3-korg