Fixes #29921 - Corrected elsif vlanid order

theforeman / community-templates

A place to share templates for various OSes for Foreman's provisioning

GNU General Public License v3.0

144 stars 182 forks source link

Fixes #29921 - Corrected elsif vlanid order #736

Closed lzap closed 4 years ago

lzap commented 4 years ago

This was not working correctly at all.

lzap commented 4 years ago

@tbrisker any chance of squeezing this into 2.1? IHAC who spotted this problem and my testing shows that this is probably the last thing missing from VLAN provisioning workflow. Let me know what we'd need (ticket, backport PR here and in core).

lzap commented 4 years ago

Ok I am starting over :-)

The most readable seems to be:

    if rhel_compatible && os_major == 6
      network_options.push("--vlanid=#{iface.tag}")
    else
      network_options.push("--interfacename=vlan#{iface.tag}")
    end

We keep only RHEL6 as the old supported version.
All other systems including Fedora must use the new syntax.
Some very old Fedora versions (e.g. 16 and older) would not work but this is unsupported for years.

tbrisker commented 4 years ago

2.1 - 986c8bb