Merge pull request #636 from ggermis/devel

specify int parameter types for wait_interval and wait_retries
reviewable/pr18780/r1
Greg DeKoenigsberg 10 years ago
commit 8a81e94c63

@ -78,13 +78,13 @@ options:
description: description:
- number of times to check for status after changing the state - number of times to check for status after changing the state
required: false required: false
default: 20 default: 25
version_added: "2.0" version_added: "2.0"
wait_interval: wait_interval:
description: description:
- number of seconds to wait between retries - number of seconds to wait between retries
required: false required: false
default: 1 default: 5
version_added: "2.0" version_added: "2.0"
''' '''
@ -129,8 +129,8 @@ import time
DEFAULT_SOCKET_LOCATION="/var/run/haproxy.sock" DEFAULT_SOCKET_LOCATION="/var/run/haproxy.sock"
RECV_SIZE = 1024 RECV_SIZE = 1024
ACTION_CHOICES = ['enabled', 'disabled'] ACTION_CHOICES = ['enabled', 'disabled']
WAIT_RETRIES=20 WAIT_RETRIES=25
WAIT_INTERVAL=1 WAIT_INTERVAL=5
###################################################################### ######################################################################
class TimeoutException(Exception): class TimeoutException(Exception):
@ -302,9 +302,9 @@ def main():
weight=dict(required=False, default=None), weight=dict(required=False, default=None),
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),
wait=dict(required=False, default=False), wait=dict(required=False, default=False, type='bool'),
wait_retries=dict(required=False, default=WAIT_RETRIES), wait_retries=dict(required=False, default=WAIT_RETRIES, type='int'),
wait_interval=dict(required=False, default=WAIT_INTERVAL), wait_interval=dict(required=False, default=WAIT_INTERVAL, type='int'),
), ),
) )

Loading…
Cancel
Save