Description of problem:
We are using 2 different parameters ovs_options and bonding_options for ovs bond and linux bonds. So far so good. In our templates we fill those params with a single variable BondInterfaceOvsOptions, whether it's for ovs or for linux bonds. But the options for the 2 types of bonds are different, e.g.

for OVS:
  bond_mode=active-backup

for Linux bond:
  mode=active-backup

This is a problem for environments with both, linux and ovs bonds. In /usr/share/openstack-tripleo-heat-templates/network/config/bond-with-vlans/role.role.j2.yaml we see:

$ grep -C2 "ovs_options\|bonding_options" /usr/share/openstack-tripleo-heat-templates/network/config/bond-with-vlans/role.role.j2.yaml 
  BondInterfaceOvsOptions:
    default: bond_mode=active-backup
    description: 'The ovs_options or bonding_options string for the bond
      interface. Set things like lacp=active and/or bond_mode=balance-slb
      for OVS bonds or like mode=4 for Linux bonds using this option.'
--
                  mtu:
                    get_attr: [MinViableMtu, value]
                  ovs_options:
                    get_param: BondInterfaceOvsOptions
                  members:
--
                mtu:
                  get_attr: [MinViableMtu, value]
                bonding_options:
                  get_param: BondInterfaceOvsOptions
                use_dhcp: false

I would suggest a different variable BondInterfaceLinuxOptions to be used everywhere were we are using Linux bonds.


Version-Release number of selected component (if applicable):
I think it's in there since OSP12 or so?

How reproducible:
always

Steps to Reproduce:
1. create an env with ovs and linux bond
2. try to set different parameters for both of them


Actual results:
you have to define a new parameter e.g. BondInterfaceLinuxOptions by your own and set it in nic configs accordingly

Expected results:
BondInterfaceOvsOptions and BondInterfaceLinuxOptions are differentiated in the first place in our environment and jinja files.