valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Interface should restart to validate if it's up

Browse Source 
Fixed "Interface's change will not valid if it's up", and add ret['changes']['status'] for enabled
This commit is contained in:
pengyao 2014-03-04 14:48:56 +08:00
parent 5d6939278b
commit 3876bb65b3
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/states/network.py
View File

@ -158,6 +158,7 @@ all interfaces are ignored unless specified.
# Import python libs # Import python libs
import difflib import difflib
import salt.utils import salt.utils
import salt.utils.network
from salt.loader import _create_loader from salt.loader import _create_loader
# Define the module's virtual name # Define the module's virtual name
@ -280,10 +281,23 @@ def managed(name, type, enabled=True, **kwargs):
# Bring up/shutdown interface # Bring up/shutdown interface
try: try:
# Get Interface current status
interface_status = salt.utils.network.interfaces()[name].get('up')
if enabled: if enabled:
__salt__['ip.up'](name, type) if interface_status:
else: if ret['changes']:
# Interface should restart to validate if it's up
__salt__['ip.down'](name, type) __salt__['ip.down'](name, type)
__salt__['ip.up'](name, type)
ret['changes']['status'] = 'Interface {0} restart to validate'.format(name)
return ret
else:
__salt__['ip.up'](name, type)
ret['changes']['status'] = 'Interface {0} is up'.format(name)
else:
if interface_status:
__salt__['ip.down'](name, type)
ret['changes']['status'] = 'Interface {0} down'.format(name)
except Exception as error: except Exception as error:
ret['result'] = False ret['result'] = False
ret['comment'] = error.message ret['comment'] = error.message