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

Changed output of haproxy commands to be more close to old behavior - except now it's a nested dictionary of {backend_name: server_list}.

Browse Source
This commit is contained in:
Vitaliy Fuks 2015-08-26 14:50:00 +00:00
parent 3c88927f10
commit 730126958f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/haproxyconn.py
View File

@ -91,12 +91,14 @@ def enable_server(name, backend, socket='/var/run/haproxy.sock'):
else: else:
backends = [backend] backends = [backend]
results = {}
for backend in backends: for backend in backends:
ha_conn = _get_conn(socket) ha_conn = _get_conn(socket)
ha_cmd = haproxy.cmds.enableServer(server=name, backend=backend) ha_cmd = haproxy.cmds.enableServer(server=name, backend=backend)
ha_conn.sendCmd(ha_cmd) ha_conn.sendCmd(ha_cmd)
results[backend] = list_servers(backend, socket=socket)
return backends return results
def disable_server(name, backend, socket='/var/run/haproxy.sock'): def disable_server(name, backend, socket='/var/run/haproxy.sock'):
@ -124,12 +126,14 @@ def disable_server(name, backend, socket='/var/run/haproxy.sock'):
else: else:
backends = [backend] backends = [backend]
results = {}
for backend in backends: for backend in backends:
ha_conn = _get_conn(socket) ha_conn = _get_conn(socket)
ha_cmd = haproxy.cmds.disableServer(server=name, backend=backend) ha_cmd = haproxy.cmds.disableServer(server=name, backend=backend)
ha_conn.sendCmd(ha_cmd) ha_conn.sendCmd(ha_cmd)
results[backend] = list_servers(backend, socket=socket)
return backends return results
def get_weight(name, backend, socket='/var/run/haproxy.sock'): def get_weight(name, backend, socket='/var/run/haproxy.sock'):