mirror of
https://github.com/ansible/awx.git
synced 2026-02-19 04:00:06 -03:30
update awx collection wait interval to 2
This commit is contained in:
committed by
Sean Sullivan
parent
35529b5eeb
commit
df649e2c56
@@ -994,7 +994,7 @@ class ControllerAPIModule(ControllerModule):
|
|||||||
else:
|
else:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def wait_on_url(self, url, object_name, object_type, timeout=30, interval=10):
|
def wait_on_url(self, url, object_name, object_type, timeout=30, interval=2):
|
||||||
# Grab our start time to compare against for the timeout
|
# Grab our start time to compare against for the timeout
|
||||||
start = time.time()
|
start = time.time()
|
||||||
result = self.get_endpoint(url)
|
result = self.get_endpoint(url)
|
||||||
@@ -1034,7 +1034,7 @@ class ControllerAPIModule(ControllerModule):
|
|||||||
for k in ('id', 'status', 'elapsed', 'started', 'finished'):
|
for k in ('id', 'status', 'elapsed', 'started', 'finished'):
|
||||||
self.json_output[k] = response['json'].get(k)
|
self.json_output[k] = response['json'].get(k)
|
||||||
|
|
||||||
def wait_on_workflow_node_url(self, url, object_name, object_type, timeout=30, interval=10, **kwargs):
|
def wait_on_workflow_node_url(self, url, object_name, object_type, timeout=30, interval=2, **kwargs):
|
||||||
# Grab our start time to compare against for the timeout
|
# Grab our start time to compare against for the timeout
|
||||||
start = time.time()
|
start = time.time()
|
||||||
result = self.get_endpoint(url, **kwargs)
|
result = self.get_endpoint(url, **kwargs)
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ options:
|
|||||||
interval:
|
interval:
|
||||||
description:
|
description:
|
||||||
- The interval to request an update from the controller.
|
- The interval to request an update from the controller.
|
||||||
default: 1
|
default: 2
|
||||||
type: float
|
type: float
|
||||||
timeout:
|
timeout:
|
||||||
description:
|
description:
|
||||||
@@ -129,7 +129,7 @@ def main():
|
|||||||
become_enabled=dict(type='bool'),
|
become_enabled=dict(type='bool'),
|
||||||
diff_mode=dict(type='bool'),
|
diff_mode=dict(type='bool'),
|
||||||
wait=dict(default=False, type='bool'),
|
wait=dict(default=False, type='bool'),
|
||||||
interval=dict(default=1.0, type='float'),
|
interval=dict(default=2.0, type='float'),
|
||||||
timeout=dict(default=None, type='int'),
|
timeout=dict(default=None, type='int'),
|
||||||
execution_environment=dict(),
|
execution_environment=dict(),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ options:
|
|||||||
description:
|
description:
|
||||||
- The interval in sections, to request an update from the controller.
|
- The interval in sections, to request an update from the controller.
|
||||||
required: False
|
required: False
|
||||||
default: 1
|
default: 2
|
||||||
type: float
|
type: float
|
||||||
timeout:
|
timeout:
|
||||||
description:
|
description:
|
||||||
@@ -90,7 +90,7 @@ def main():
|
|||||||
argument_spec = dict(
|
argument_spec = dict(
|
||||||
command_id=dict(type='int', required=True),
|
command_id=dict(type='int', required=True),
|
||||||
timeout=dict(type='int'),
|
timeout=dict(type='int'),
|
||||||
interval=dict(type='float', default=1),
|
interval=dict(type='float', default=2),
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create a module for ourselves
|
# Create a module for ourselves
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ options:
|
|||||||
description:
|
description:
|
||||||
- The interval to request an update from the controller.
|
- The interval to request an update from the controller.
|
||||||
required: False
|
required: False
|
||||||
default: 1
|
default: 2
|
||||||
type: float
|
type: float
|
||||||
timeout:
|
timeout:
|
||||||
description:
|
description:
|
||||||
@@ -93,7 +93,7 @@ def main():
|
|||||||
inventory=dict(required=True),
|
inventory=dict(required=True),
|
||||||
organization=dict(),
|
organization=dict(),
|
||||||
wait=dict(default=False, type='bool'),
|
wait=dict(default=False, type='bool'),
|
||||||
interval=dict(default=1.0, type='float'),
|
interval=dict(default=2.0, type='float'),
|
||||||
timeout=dict(default=None, type='int'),
|
timeout=dict(default=None, type='int'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ options:
|
|||||||
description:
|
description:
|
||||||
- The interval to request an update from the controller.
|
- The interval to request an update from the controller.
|
||||||
required: False
|
required: False
|
||||||
default: 1
|
default: 2
|
||||||
type: float
|
type: float
|
||||||
timeout:
|
timeout:
|
||||||
description:
|
description:
|
||||||
@@ -166,7 +166,7 @@ def main():
|
|||||||
diff_mode=dict(type='bool'),
|
diff_mode=dict(type='bool'),
|
||||||
credential_passwords=dict(type='dict', no_log=False),
|
credential_passwords=dict(type='dict', no_log=False),
|
||||||
wait=dict(default=False, type='bool'),
|
wait=dict(default=False, type='bool'),
|
||||||
interval=dict(default=1.0, type='float'),
|
interval=dict(default=2.0, type='float'),
|
||||||
timeout=dict(default=None, type='int'),
|
timeout=dict(default=None, type='int'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ options:
|
|||||||
- The interval in sections, to request an update from the controller.
|
- The interval in sections, to request an update from the controller.
|
||||||
- For backwards compatibility if unset this will be set to the average of min and max intervals
|
- For backwards compatibility if unset this will be set to the average of min and max intervals
|
||||||
required: False
|
required: False
|
||||||
default: 1
|
default: 2
|
||||||
type: float
|
type: float
|
||||||
timeout:
|
timeout:
|
||||||
description:
|
description:
|
||||||
@@ -96,7 +96,7 @@ def main():
|
|||||||
job_id=dict(type='int', required=True),
|
job_id=dict(type='int', required=True),
|
||||||
job_type=dict(choices=['project_updates', 'jobs', 'inventory_updates', 'workflow_jobs'], default='jobs'),
|
job_type=dict(choices=['project_updates', 'jobs', 'inventory_updates', 'workflow_jobs'], default='jobs'),
|
||||||
timeout=dict(type='int'),
|
timeout=dict(type='int'),
|
||||||
interval=dict(type='float', default=1),
|
interval=dict(type='float', default=2),
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create a module for ourselves
|
# Create a module for ourselves
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ options:
|
|||||||
- The interval to request an update from the controller.
|
- The interval to request an update from the controller.
|
||||||
- Requires wait.
|
- Requires wait.
|
||||||
required: False
|
required: False
|
||||||
default: 1
|
default: 2
|
||||||
type: float
|
type: float
|
||||||
extends_documentation_fragment: awx.awx.auth
|
extends_documentation_fragment: awx.awx.auth
|
||||||
'''
|
'''
|
||||||
@@ -278,7 +278,7 @@ def main():
|
|||||||
state=dict(choices=['present', 'absent'], default='present'),
|
state=dict(choices=['present', 'absent'], default='present'),
|
||||||
wait=dict(type='bool', default=True),
|
wait=dict(type='bool', default=True),
|
||||||
update_project=dict(default=False, type='bool'),
|
update_project=dict(default=False, type='bool'),
|
||||||
interval=dict(default=1.0, type='float'),
|
interval=dict(default=2.0, type='float'),
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create a module for ourselves
|
# Create a module for ourselves
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ options:
|
|||||||
description:
|
description:
|
||||||
- The interval to request an update from the controller.
|
- The interval to request an update from the controller.
|
||||||
required: False
|
required: False
|
||||||
default: 1
|
default: 2
|
||||||
type: float
|
type: float
|
||||||
timeout:
|
timeout:
|
||||||
description:
|
description:
|
||||||
@@ -86,7 +86,7 @@ def main():
|
|||||||
name=dict(required=True, aliases=['project']),
|
name=dict(required=True, aliases=['project']),
|
||||||
organization=dict(),
|
organization=dict(),
|
||||||
wait=dict(default=True, type='bool'),
|
wait=dict(default=True, type='bool'),
|
||||||
interval=dict(default=1.0, type='float'),
|
interval=dict(default=2.0, type='float'),
|
||||||
timeout=dict(default=None, type='int'),
|
timeout=dict(default=None, type='int'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ options:
|
|||||||
description:
|
description:
|
||||||
- The interval to request an update from the controller.
|
- The interval to request an update from the controller.
|
||||||
required: False
|
required: False
|
||||||
default: 1
|
default: 2
|
||||||
type: float
|
type: float
|
||||||
timeout:
|
timeout:
|
||||||
description:
|
description:
|
||||||
@@ -104,7 +104,7 @@ def main():
|
|||||||
scm_branch=dict(),
|
scm_branch=dict(),
|
||||||
extra_vars=dict(type='dict'),
|
extra_vars=dict(type='dict'),
|
||||||
wait=dict(required=False, default=True, type='bool'),
|
wait=dict(required=False, default=True, type='bool'),
|
||||||
interval=dict(required=False, default=1.0, type='float'),
|
interval=dict(required=False, default=2.0, type='float'),
|
||||||
timeout=dict(required=False, default=None, type='int'),
|
timeout=dict(required=False, default=None, type='int'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user