saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2019.2.1' into aix_docs

Browse source
This commit is contained in:
Akmod 2019-06-04 13:34:39 -06:00 • committed by GitHub
commit fae6045c3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/rh_ip.py
View file

@ -1032,6 +1032,14 @@ def build_interface(iface, iface_type, enabled, **settings):
rh_major = '7'
else:
rh_major = '6'
elif __grains__['os'] == 'Amazon':
# TODO: Is there a better formula for this? -W. Werner, 2019-05-30
# If not, it will need to be updated whenever Amazon releases
# Amazon Linux 3
if __grains__['osmajorrelease'] == 2:
rh_major = '7'
else:
rh_major = '6'
else:
rh_major = __grains__['osrelease'][:1]