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

Bump warning version from Oxygen to Fluorine in roster cache

Browse source 
The change was introduced in 2017.7 - we need to provide at least
2 feature releases before removing this warning. Therefore, this
PR bumps the version we will warn until from Oxygen to Fluorine.
This commit is contained in:
rallytime 2017-07-21 10:18:20 -06:00
parent 33e90be1fe
commit c0df0137f5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/roster/cache.py
View file

@ -129,7 +129,7 @@ def targets(tgt, tgt_type='glob', **kwargs): # pylint: disable=W0613
'host': ('ipv6-private', 'ipv6-global', 'ipv4-private', 'ipv4-public')
})
if isinstance(roster_order, (tuple, list)):
salt.utils.warn_until('Oxygen',
salt.utils.warn_until('Fluorine',
'Using legacy syntax for roster_order')
roster_order = {
'host': roster_order
@ -137,7 +137,7 @@ def targets(tgt, tgt_type='glob', **kwargs): # pylint: disable=W0613
for config_key, order in roster_order.items():
for idx, key in enumerate(order):
if key in ('public', 'private', 'local'):
salt.utils.warn_until('Oxygen',
salt.utils.warn_until('Fluorine',
'roster_order {0} will include IPv6 soon. '
'Set order to ipv4-{0} if needed.'.format(key))
order[idx] = 'ipv4-' + key