mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
Merge pull request #26660 from vitaliyf/haproxy-support-wildcard-backend
Support ability to pass "*" as wildcard backend in haproxyconn enabe/disable_server.
This commit is contained in:
commit
264ab9655a
@ -74,7 +74,7 @@ def enable_server(name, backend, socket='/var/run/haproxy.sock'):
|
||||
Server to enable
|
||||
|
||||
backend
|
||||
haproxy backend
|
||||
haproxy backend, or all backends if "*" is supplied
|
||||
|
||||
socket
|
||||
haproxy stats socket
|
||||
@ -85,10 +85,20 @@ def enable_server(name, backend, socket='/var/run/haproxy.sock'):
|
||||
|
||||
salt '*' haproxy.enable_server web1.example.com www
|
||||
'''
|
||||
ha_conn = _get_conn(socket)
|
||||
ha_cmd = haproxy.cmds.enableServer(server=name, backend=backend)
|
||||
ha_conn.sendCmd(ha_cmd)
|
||||
return list_servers(backend, socket=socket)
|
||||
|
||||
if backend == '*':
|
||||
backends = show_backends(socket=socket).split('\n')
|
||||
else:
|
||||
backends = [backend]
|
||||
|
||||
results = {}
|
||||
for backend in backends:
|
||||
ha_conn = _get_conn(socket)
|
||||
ha_cmd = haproxy.cmds.enableServer(server=name, backend=backend)
|
||||
ha_conn.sendCmd(ha_cmd)
|
||||
results[backend] = list_servers(backend, socket=socket)
|
||||
|
||||
return results
|
||||
|
||||
|
||||
def disable_server(name, backend, socket='/var/run/haproxy.sock'):
|
||||
@ -99,7 +109,7 @@ def disable_server(name, backend, socket='/var/run/haproxy.sock'):
|
||||
Server to disable
|
||||
|
||||
backend
|
||||
haproxy backend
|
||||
haproxy backend, or all backends if "*" is supplied
|
||||
|
||||
socket
|
||||
haproxy stats socket
|
||||
@ -110,10 +120,20 @@ def disable_server(name, backend, socket='/var/run/haproxy.sock'):
|
||||
|
||||
salt '*' haproxy.disable_server db1.example.com mysql
|
||||
'''
|
||||
ha_conn = _get_conn(socket)
|
||||
ha_cmd = haproxy.cmds.disableServer(server=name, backend=backend)
|
||||
ha_conn.sendCmd(ha_cmd)
|
||||
return list_servers(backend, socket=socket)
|
||||
|
||||
if backend == '*':
|
||||
backends = show_backends(socket=socket).split('\n')
|
||||
else:
|
||||
backends = [backend]
|
||||
|
||||
results = {}
|
||||
for backend in backends:
|
||||
ha_conn = _get_conn(socket)
|
||||
ha_cmd = haproxy.cmds.disableServer(server=name, backend=backend)
|
||||
ha_conn.sendCmd(ha_cmd)
|
||||
results[backend] = list_servers(backend, socket=socket)
|
||||
|
||||
return results
|
||||
|
||||
|
||||
def get_weight(name, backend, socket='/var/run/haproxy.sock'):
|
||||
|
Loading…
Reference in New Issue
Block a user