diff options
| author | Ryan Petrello <rpetrell@redhat.com> | 2017-06-26 21:35:43 +0200 |
|---|---|---|
| committer | Ryan Petrello <rpetrell@redhat.com> | 2017-06-26 21:47:14 +0200 |
| commit | bfb7ad15aefb0124e8827b1e17b99a6bde46c68d (patch) | |
| tree | e317aaeb1fad9ef6a9548fb13ee190fac1bd81d2 | |
| parent | Merge pull request #6575 from jangsutsr/6220_add_docs_for_tower_configuration (diff) | |
| download | awx-bfb7ad15aefb0124e8827b1e17b99a6bde46c68d.tar.xz awx-bfb7ad15aefb0124e8827b1e17b99a6bde46c68d.zip | |
make isolated rampart settings API-configurable
see: #6659
| -rw-r--r-- | awx/main/conf.py | 18 | ||||
| -rw-r--r-- | awx/settings/defaults.py | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/awx/main/conf.py b/awx/main/conf.py index c0bef6c794..dc888ca43b 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -156,6 +156,24 @@ register( ) register( + 'AWX_ISOLATED_CHECK_INTERVAL', + field_class=fields.IntegerField, + label=_('Isolated status check interval'), + help_text=_('The number of seconds to sleep between status checks for jobs running on isolated instances.'), # noqa + category=_('Jobs'), + category_slug='jobs', +) + +register( + 'AWX_ISOLATED_LAUNCH_TIMEOUT', + field_class=fields.IntegerField, + label=_('Isolated launch timeout'), + help_text=_('The timeout (in seconds) for launching jobs on isolated instances. This includes the time needed to copy source control files (playbooks) to the isolated instance.'), + category=_('Jobs'), + category_slug='jobs', +) + +register( 'STDOUT_MAX_BYTES_DISPLAY', field_class=fields.IntegerField, min_value=0, diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index dcb8e800aa..b0f0c36a80 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -609,7 +609,8 @@ AWX_ISOLATED_CHECK_INTERVAL = 30 # The timeout (in seconds) for launching jobs on isolated nodes AWX_ISOLATED_LAUNCH_TIMEOUT = 600 -# The time between the background isolated heartbeat status check + +# The time (in seconds) between the periodic isolated heartbeat status check AWX_ISOLATED_PERIODIC_CHECK = 600 # Enable Pendo on the UI, possible values are 'off', 'anonymous', and 'detailed' |