Merge pull request #537 from dmbaturin/veps

build flavors: T3664: reimplement Dell VEP flavors using the new system

2 files changed, 383 insertions, 0 deletions

diff --git a/data/build-flavors/dell-vep1400.toml b/data/build-flavors/dell-vep1400.toml
new file mode 100644
index 00000000..8ce3d8b6
--- /dev/null
+++ b/data/build-flavors/dell-vep1400.toml
@@ -0,0 +1,116 @@
+# ISO image for Dell VEP4600 devices
+
+image_formats = "iso"
+
+# Replace built-in NIC naming rules with empty files
+# to prevent them from taking any effect
+
+[[includes_chroot]]
+  path = "lib/systemd/network/99-default.link"
+  data = ''
+
+[[includes_chroot]]
+  path = "lib/udev/rules.d/65-vyatta-net.rules"
+  data = ''
+
+[[includes_chroot]]
+  path = "lib/udev/rules.d/75-persistent-net-generator.rules"
+  data = ''
+
+# Install platform-specific link files
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth0-000.link"
+  data = '''
+[Match]
+Path=pci-0000:05:00.1
+Driver=ixgbe
+
+[Link]
+Name=eth0
+Alias=SFP+1
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth1-000.link"
+  data = '''
+[Match]
+Path=pci-0000:05:00.0
+Driver=ixgbe
+
+[Link]
+Name=eth1
+Alias=SFP+2
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth2-000.link"
+  data = '''
+[Match]
+Path=pci-0000:02:00.2
+Driver=igb
+
+[Link]
+Name=eth2
+Alias=GE1
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth3-000.link"
+  data = '''
+[Match]
+Path=pci-0000:02:00.3
+Driver=igb
+
+[Link]
+Name=eth3
+Alias=GE2
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth4-000.link"
+  data = '''
+[Match]
+Path=pci-0000:02:00.0
+Driver=igb
+
+[Link]
+Name=eth4
+Alias=GE3
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth5-000.link"
+  data = '''
+[Match]
+Path=pci-0000:02:00.1
+Driver=igb
+
+[Link]
+Name=eth5
+Alias=GE4
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth6-000.link"
+  data = '''
+[Match]
+Path=pci-0000:07:00.1
+Driver=ixgbe
+
+[Link]
+Name=eth6
+Alias=GE5
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth7-000.link"
+  data = '''
+[Match]
+Path=pci-0000:07:00.0
+Driver=ixgbe
+
+[Link]
+Name=eth7
+Alias=GE6
+'''
diff --git a/data/build-flavors/dell-vep4600.toml b/data/build-flavors/dell-vep4600.toml
new file mode 100644
index 00000000..97256b41
--- /dev/null
+++ b/data/build-flavors/dell-vep4600.toml
@@ -0,0 +1,267 @@
+# ISO image for Dell VEP4600 devices
+
+image_formats = "iso"
+
+# Replace built-in NIC naming rules with empty files
+# to prevent them from taking any effect
+
+[[includes_chroot]]
+  path = "lib/systemd/network/99-default.link"
+  data = ''
+
+[[includes_chroot]]
+  path = "lib/udev/rules.d/65-vyatta-net.rules"
+  data = ''
+
+[[includes_chroot]]
+  path = "lib/udev/rules.d/75-persistent-net-generator.rules"
+  data = ''
+
+# Install platform-specific link files
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth0-000.link"
+  data = '''
+[Match]
+Path=pci-0000:04:00.0
+Driver=igb
+
+[Link]
+Name=eth0
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth0-001.link"
+  data = '''
+[Match]
+Path=pci-0000:05:00.0
+Driver=igb
+
+[Link]
+Name=eth0
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth10-000.link"
+  data = '''
+[Match]
+Path=pci-0000:65:00.3
+Driver=i40e
+
+[Link]
+Name=eth10
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth1-000.link"
+  data = '''
+[Match]
+Path=pci-0000:b8:00.0
+Driver=i40e
+
+[Link]
+Name=eth1
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth1-001.link"
+  data = '''
+[Match]
+Path=pci-0000:b6:00.0
+Driver=i40e
+
+[Link]
+Name=eth1
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth11-000.link"
+  data = '''
+[Match]
+Path=pci-0000:17:00.0
+Driver=i40e
+
+[Link]
+Name=eth11
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth12-000.link"
+  data = '''
+[Match]
+Path=pci-0000:17:00.1
+Driver=i40e
+
+[Link]
+Name=eth12
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth13-000.link"
+  data = '''
+[Match]
+Path=pci-0000:17:00.2
+Driver=i40e
+
+[Link]
+Name=eth13
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth14-000.link"
+  data = '''
+[Match]
+Path=pci-0000:17:00.3
+Driver=i40e
+
+[Link]
+Name=eth14
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth2-000.link"
+  data = '''
+[Match]
+Path=pci-0000:b8:00.1
+Driver=i40e
+
+[Link]
+Name=eth2
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth2-001.link"
+  data = '''
+[Match]
+Path=pci-0000:b6:00.1
+Driver=i40e
+
+[Link]
+Name=eth2
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth3-000.link"
+  data = '''
+[Match]
+Path=pci-0000:02:00.1
+Driver=igb
+
+[Link]
+Name=eth3
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth4-000.link"
+  data = '''
+[Match]
+Path=pci-0000:02:00.0
+Driver=igb
+
+[Link]
+Name=eth4
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth5-000.link"
+  data = '''
+[Match]
+Path=pci-0000:02:00.3
+Driver=igb
+
+[Link]
+Name=eth5
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth6-000.link"
+  data = '''
+[Match]
+Path=pci-0000:02:00.2
+Driver=igb
+
+[Link]
+Name=eth6
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth7-000.link"
+  data = '''
+[Match]
+Path=pci-0000:65:00.0
+Driver=i40e
+
+[Link]
+Name=eth7
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth8-000.link"
+  data = '''
+[Match]
+Path=pci-0000:65:00.1
+Driver=i40e
+
+[Link]
+Name=eth8
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-eth9-000.link"
+  data = '''
+[Match]
+Path=pci-0000:65:00.2
+Driver=i40e
+
+[Link]
+Name=eth9
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-unused0-000.link"
+  data = '''
+[Match]
+Path=pci-0000:b8:00.2
+Driver=i40e
+
+[Link]
+Name=unused0
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-unused0-001.link"
+  data = '''
+[Match]
+Path=pci-0000:b6:00.2
+Driver=i40e
+
+[Link]
+Name=unused0
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-unused1-000.link"
+  data = '''
+[Match]
+Path=pci-0000:b8:00.3
+Driver=i40e
+
+[Link]
+Name=unused1
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/10-unused1-001.link"
+  data = '''
+[Match]
+Path=pci-0000:b6:00.3
+Driver=i40e
+
+[Link]
+Name=unused1
+'''
+
+[[includes_chroot]]
+  path = "etc/systemd/network/99-default.link"
+  data = '''
+'''