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

Instead of action [enable_server,disable_server] we prefer to use state [enabled,disabled] [FIXED] misplaced the checkmode support (#L146) [FIXED] no need to check if host is not set as the argument spec (#L138), it should already complain about that [FIXED]

Browse source
This commit is contained in:
Ravi Bhure 2014-12-03 08:14:35 -07:00 committed by Matt Clay
parent 6edde18f90
commit a1c5149de3
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@ options:
- Action to take. - Action to take.
required: true required: true
default: null default: null
choices: [ "enable_server", "disable_server", "get_weight", "set_weight" ] choices: [ "enabled", "disabled", "get_weight", "set_weight" ]
host: host:
description: description:
- Host (backend) to operate in Haproxy. - Host (backend) to operate in Haproxy.
@ -67,19 +67,19 @@ options:
EXAMPLES = ''' EXAMPLES = '''
# disable backend server in 'www' backend # disable backend server in 'www' backend
- haproxy: action=disable_server host={{ inventory_hostname }} backend=www - haproxy: action=disabled host={{ inventory_hostname }} backend=www
# disable backend server without backend name (applied to all) # disable backend server without backend name (applied to all)
- haproxy: action=disable_server host={{ inventory_hostname }} - haproxy: action=disabled host={{ inventory_hostname }}
# disable server, provide socket file # disable server, provide socket file
- haproxy: action=disable_server host={{ inventory_hostname }} socket=/var/run/haproxy.sock backend=www - haproxy: action=disabled host={{ inventory_hostname }} socket=/var/run/haproxy.sock backend=www
# disable backend server in 'www' backend and drop open sessions to it # disable backend server in 'www' backend and drop open sessions to it
- haproxy: action=disable_server host={{ inventory_hostname }} backend=www shutdown_sessions=true - haproxy: action=disabled host={{ inventory_hostname }} backend=www shutdown_sessions=true
# enable backend server in 'www' backend # enable backend server in 'www' backend
- haproxy: action=enable_server host={{ inventory_hostname }} backend=www - haproxy: action=enabled host={{ inventory_hostname }} backend=www
# report a server's current weight in 'www' backend # report a server's current weight in 'www' backend
- haproxy: action=get_weight host={{ inventory_hostname }} backend=www - haproxy: action=get_weight host={{ inventory_hostname }} backend=www
@ -102,8 +102,8 @@ RECV_SIZE = 1024
def main(): def main():
ACTION_CHOICES = [ ACTION_CHOICES = [
'enable_server', 'enabled',
'disable_server', 'disabled',
'get_weight', 'get_weight',
'set_weight' 'set_weight'
] ]
@ -118,6 +118,8 @@ def main():
socket = dict(required=False, default=DEFAULT_SOCKET_LOCATION), socket = dict(required=False, default=DEFAULT_SOCKET_LOCATION),
shutdown_sessions=dict(required=False, default=False), shutdown_sessions=dict(required=False, default=False),
), ),
supports_check_mode=True,
) )
action = module.params['action'] action = module.params['action']
host = module.params['host'] host = module.params['host']
@ -128,22 +130,22 @@ def main():
################################################################## ##################################################################
# Required args per action: # Required args per action:
# (enable/disable)_server = (host) # (enabled/disabled) = (host)
# #
# AnsibleModule will verify most stuff, we need to verify # AnsibleModule will verify most stuff, we need to verify
# 'socket' manually. # 'socket' manually.
################################################################## ##################################################################
if action in ['enable_server', 'disable_server', 'get_weight', 'set_weight']: if action in ['set_weight']:
if not host: if not weight:
module.fail_json(msg='no host specified for action requiring one') module.fail_json(msg='no weight specified for action, require value in number')
################################################################## ##################################################################
if not socket: if not socket:
module.fail_json('unable to locate haproxy.sock') module.fail_json('unable to locate haproxy.sock')
################################################################## ##################################################################
supports_check_mode=True,
required_one_of=[['action', 'host']] required_one_of=[['action', 'host']]
ansible_haproxy = HAProxy(module, **module.params) ansible_haproxy = HAProxy(module, **module.params)
@ -202,7 +204,7 @@ class HAProxy(object):
self.client.close() self.client.close()
return result return result
def enable_server(self, host, backend): def enabled(self, host, backend):
""" """
Enables backend server for a particular backend. Enables backend server for a particular backend.
@ -238,7 +240,7 @@ class HAProxy(object):
cmd = "enable server %s/%s" % (pxname, svname) cmd = "enable server %s/%s" % (pxname, svname)
self.execute(cmd) self.execute(cmd)
def disable_server(self, host, backend, shutdown_sessions): def disabled(self, host, backend, shutdown_sessions):
""" """
Disable backend server for a particular backend. Disable backend server for a particular backend.
@ -366,11 +368,11 @@ class HAProxy(object):
needful (at the earliest). needful (at the earliest).
""" """
# toggle enable/disbale server # toggle enable/disbale server
if self.action == 'enable_server': if self.action == 'enabled':
self.enable_server(self.host, self.backend) self.enabled(self.host, self.backend)
elif self.action == 'disable_server': elif self.action == 'disabled':
self.disable_server(self.host, self.backend, self.shutdown_sessions) self.disabled(self.host, self.backend, self.shutdown_sessions)
# toggle get/set weight # toggle get/set weight
elif self.action == 'get_weight': elif self.action == 'get_weight':