Remove use_carrier bond for Ubuntu Xenial later #34779
Conversation
| bond.update({'use_carrier': '1'}) | ||
| elif opts['use_carrier'] in _CONFIG_FALSE: | ||
| bond.update({'use_carrier': '0'}) | ||
| if __grains__['os'] == "Ubuntu" and __grains__['osrelease_info'][0] >= 16: |
There was a problem hiding this comment.
Did you mean for this to be <= 16 instead of >=? As this stands, this will cause the if 'use_carrier' in opts block to be skipped for older versions of Ubuntu, which is a change in behavior that I don't think you're intending based on your description of the issue.
I am also curious if this block is used for Debian boxes and if only checking for Ubuntu releases, this will cause a regression.
There was a problem hiding this comment.
You are right. It should not use use_carrier for Ubuntu equal or greater than 16.04, because this option is there unknown. I am not sure how is it with Debian releases.
rallytime
added
the
Pending-Discussion
| bond.update({'use_carrier': '1'}) | ||
| elif opts['use_carrier'] in _CONFIG_FALSE: | ||
| bond.update({'use_carrier': '0'}) | ||
| if __grains__['os'] == "Ubuntu" and __grains__['osrelease_info'][0] <= 16: |
There was a problem hiding this comment.
@pupapaik Thanks for switching the >= to <= here. That makes more sense.
I am still concerned that the check for Ubuntu in the os grain here will cause problems for Debian releases and I'd like to avoid a regression.
network.managed type bond generate use_carrier option, which is unknown parameter in ubuntu 16.04 Fixes saltstack#34778
|
Can you validate it now? It should affect only Ubuntu Xenial or greater. |
|
@pupapaik Great! Thank you! |
rallytime
removed
the
Pending-Discussion
* upstream/develop: (153 commits) Increase all run_script timeouts to 30s (saltstack#34956) Fix grains integration tests for Windows (saltstack#34941) GCE Cloud tests (saltstack#34871) Create regdata before try/except (saltstack#34931) Add prune option to reg.list (saltstack#34934) Skip inode test in Windows (saltstack#34938) Remove use_carrier bond for Ubuntu Xenial later (saltstack#34779) Add jid to salt.function orchestration events [bashcompletion] replace ticks with bash subshell [bashcompletion] ignore salt-key headers Add jid to orchestration returns Avoid UnboundLocalError in beacons module [bash-completion] hide timeout in salt-output Master performance improvement (saltstack#34916) Update service_rh provider to exclude XenServer >= 7. (saltstack#34915) Lint fixes for saltstack#34923 pv_present should execute pvcreate with -y if existing filesystem signature detected Handle exception when no Slack API key was provided zone absent with tests added zone_present state check ...
network.managed type bond generate use_carrier
option, which is unknown parameter in ubuntu 16.04
Fixes #34778