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

Recorded the changes suggested by brian coca

Browse source
This commit is contained in:
Ravi Bhure 2014-12-07 02:29:16 -07:00 committed by Matt Clay
parent e0f0cc4049
commit 7e83da3480
1 changed files with 80 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
lib/ansible/modules/extras/network/haproxy.py
View file

@ -102,55 +102,7 @@ logger = logging.getLogger(__name__)
DEFAULT_SOCKET_LOCATION="/var/run/haproxy.sock" DEFAULT_SOCKET_LOCATION="/var/run/haproxy.sock"
RECV_SIZE = 1024 RECV_SIZE = 1024
ACTION_CHOICES = ['enabled', 'disabled']
def main():
ACTION_CHOICES = [
'enabled',
'disabled',
]
# load ansible module object
module = AnsibleModule(
argument_spec = dict(
state = dict(required=True, default=None, choices=ACTION_CHOICES),
host=dict(required=True, default=None),
backend=dict(required=False, default=None),
weight=dict(required=False, default=None),
socket = dict(required=False, default=DEFAULT_SOCKET_LOCATION),
shutdown_sessions=dict(required=False, default=False),
),
supports_check_mode=True,
)
state = module.params['state']
host = module.params['host']
backend = module.params['backend']
weight = module.params['weight']
socket = module.params['socket']
shutdown_sessions = module.params['shutdown_sessions']
##################################################################
# Required args per state:
# (enabled/disabled) = (host)
#
# AnsibleModule will verify most stuff, we need to verify
# 'socket' manually.
##################################################################
##################################################################
if not socket:
module.fail_json('unable to locate haproxy.sock')
##################################################################
required_one_of=[['state', 'host']]
ansible_haproxy = HAProxy(module, **module.params)
if module.check_mode:
module.exit_json(changed=True)
else:
ansible_haproxy.act()
##################################################################
###################################################################### ######################################################################
class TimeoutException(Exception): class TimeoutException(Exception):
@ -202,19 +154,9 @@ class HAProxy(object):
def enabled(self, host, backend, weight): def enabled(self, host, backend, weight):
""" """
Enables backend server for a particular backend. Enabled action, marks server to UP and checks are re-enabled,
also supports to get current weight for server (default) and
enable server <backend>/<server> set the weight for haproxy backend server when provides.
If the server was previously marked as DOWN for maintenance, this marks the
server UP and checks are re-enabled.
Both the backend and the server may be specified either by their name or by
their numeric ID, prefixed with a sharp ('#').
This command is restricted and can only be issued on sockets configured for
level "admin".
Syntax: enable server <pxname>/<svname>
""" """
svname = host svname = host
if self.backend is None: if self.backend is None:
@ -242,24 +184,9 @@ class HAProxy(object):
def disabled(self, host, backend, shutdown_sessions): def disabled(self, host, backend, shutdown_sessions):
""" """
Disable backend server for a particular backend. Disabled action, marks server to DOWN for maintenance. In this mode, no more checks will be
performed on the server until it leaves maintenance,
disable server <backend>/<server> also it shutdown sessions while disabling backend host server.
Mark the server DOWN for maintenance. In this mode, no more checks will be
performed on the server until it leaves maintenance.
If the server is tracked by other servers, those servers will be set to DOWN
during the maintenance.
In the statistics page, a server DOWN for maintenance will appear with a
"MAINT" status, its tracking servers with the "MAINT(via)" one.
Both the backend and the server may be specified either by their name or by
their numeric ID, prefixed with a sharp ('#').
This command is restricted and can only be issued on sockets configured for
level "admin".
Syntax: disable server <pxname>/<svname>
""" """
svname = host svname = host
if self.backend is None: if self.backend is None:
@ -274,14 +201,14 @@ class HAProxy(object):
result = line.split(',')[0] result = line.split(',')[0]
pxname = result pxname = result
cmd = "get weight %s/%s ; disable server %s/%s" % (pxname, svname, pxname, svname) cmd = "get weight %s/%s ; disable server %s/%s" % (pxname, svname, pxname, svname)
if shutdown_sessions == 'true': if shutdown_sessions:
cmd += "; shutdown sessions server %s/%s" % (pxname, svname) cmd += "; shutdown sessions server %s/%s" % (pxname, svname)
self.execute(cmd) self.execute(cmd)
else: else:
pxname = backend pxname = backend
cmd = "get weight %s/%s ; disable server %s/%s" % (pxname, svname, pxname, svname) cmd = "get weight %s/%s ; disable server %s/%s" % (pxname, svname, pxname, svname)
if shutdown_sessions == 'true': if shutdown_sessions:
cmd += "; shutdown sessions server %s/%s" % (pxname, svname) cmd += "; shutdown sessions server %s/%s" % (pxname, svname)
self.execute(cmd) self.execute(cmd)
@ -290,6 +217,7 @@ class HAProxy(object):
Figure out what you want to do from ansible, and then do the Figure out what you want to do from ansible, and then do the
needful (at the earliest). needful (at the earliest).
""" """
# toggle enable/disbale server # toggle enable/disbale server
if self.state == 'enabled': if self.state == 'enabled':
self.enabled(self.host, self.backend, self.weight) self.enabled(self.host, self.backend, self.weight)
@ -303,6 +231,47 @@ class HAProxy(object):
self.module.exit_json(stdout=self.command_results, changed=True) self.module.exit_json(stdout=self.command_results, changed=True)
def main():
# load ansible module object
module = AnsibleModule(
argument_spec = dict(
state = dict(required=True, default=None, choices=ACTION_CHOICES),
host=dict(required=True, default=None),
backend=dict(required=False, default=None),
weight=dict(required=False, default=None),
socket = dict(required=False, default=DEFAULT_SOCKET_LOCATION),
shutdown_sessions=dict(required=False, default=False),
),
)
state = module.params['state']
host = module.params['host']
backend = module.params['backend']
weight = module.params['weight']
socket = module.params['socket']
shutdown_sessions = module.params['shutdown_sessions']
##################################################################
# Required args per state:
# (enabled/disabled) = (host)
#
# AnsibleModule will verify most stuff, we need to verify
# 'socket' manually.
##################################################################
##################################################################
if not socket:
module.fail_json(msg="unable to locate haproxy socket")
##################################################################
required_one_of=[['state', 'host']]
ansible_haproxy = HAProxy(module, **module.params)
ansible_haproxy.act()
##################################################################
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *