cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

using module.get_bin_path to find ovs-vsctl

Browse source
This commit is contained in:
Mark Hamilton 2015-08-24 13:45:12 -07:00 committed by Matt Clay
parent 8957d5371a
commit de7ba0a08c
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/extras/network/openvswitch_db.py
View file

@ -68,7 +68,7 @@ EXAMPLES = '''
- openvswitch_db: table=open_vswitch record=. col=other_config key=max-idle - openvswitch_db: table=open_vswitch record=. col=other_config key=max-idle
value=50000 value=50000
# Disable in band # Disable in band copy
- openvswitch_db: table=Bridge record=br-int col=other_config - openvswitch_db: table=Bridge record=br-int col=other_config
key=disable-in-band value=true key=disable-in-band value=true
''' '''
@ -76,6 +76,7 @@ EXAMPLES = '''
def cmd_run(module, cmd, check_rc=True): def cmd_run(module, cmd, check_rc=True):
""" Log and run ovs-vsctl command. """ """ Log and run ovs-vsctl command. """
syslog.syslog(syslog.LOG_NOTICE, cmd)
return module.run_command(cmd.split(" "), check_rc=check_rc) return module.run_command(cmd.split(" "), check_rc=check_rc)
@ -84,13 +85,18 @@ def params_set(module):
changed = False changed = False
fmt = "ovs-vsctl -t %(timeout)s get %(table)s %(record)s %(col)s:%(key)s" ##
# Place in params dictionary in order to support the string format below.
module.params["ovs-vsctl"] = module.get_bin_path("ovs-vsctl", True)
fmt = "%(ovs-vsctl)s -t %(timeout)s get %(table)s %(record)s " \
"%(col)s:%(key)s"
cmd = fmt % module.params cmd = fmt % module.params
(_, output, _) = cmd_run(module, cmd, False) (_, output, _) = cmd_run(module, cmd, False)
if module.params['value'] not in output: if module.params['value'] not in output:
fmt = "ovs-vsctl -t %(timeout)s set %(table)s %(record)s " \ fmt = "%(ovs-vsctl)s -t %(timeout)s set %(table)s %(record)s " \
"%(col)s:%(key)s=%(value)s" "%(col)s:%(key)s=%(value)s"
cmd = fmt % module.params cmd = fmt % module.params
## ##