zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-15 07:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
31,157 Commits 35 Branches 71 Tags
16d39bb72be3f9562ed5cae11db2931f62397194
Commit Graph

31157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aperigault 2ef840ce12 Fix encrypted translation 2021-11-16 16:27:27 +01:00
Antony Perigault a372d8d1d5 fix french typos 2021-11-16 16:27:27 +01:00
Shane McDonald be13a11dd5 Merge pull request #11344 from Akasurde/typo 
Misc typo fix
 2021-11-16 16:52:30 +08:00
Paul Belanger 59c6f35b0b Set SESSION_COOKIE_NAME by default 
Make sure to use a different session cookie name then the default, to
avoid overlapping cookies with other django apps that might be running.

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
 2021-11-15 12:59:07 -05:00
Abhijeet Kasurde 37e45c5e7c Misc typo fix 
Changed 'controler' to 'controller'

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
 2021-11-15 16:24:21 +05:30
Shane McDonald aec7ac6ebd Merge pull request #11341 from shanemcd/fix-image-builds 
Fix official image builds
 2021-11-13 14:31:26 +08:00
Shane McDonald f6e63d0917 Fix official image builds 
I broke everything in https://github.com/ansible/awx/pull/11242.

These changes were necessary in order to run `awx-manage collectstatic` without a running database.
 2021-11-13 06:07:37 +00:00
Rebeccah Hunter 0ae67edaba Merge pull request #11267 from ziegenberg/add-tests-for-webhook-notifications 
Add unit tests for webhook notifications
 2021-11-11 09:55:38 -05:00
Shane McDonald 481f6435ee Merge pull request #11327 from shanemcd/downstream-changes 
Pull in downstream changes
 2021-11-11 11:09:22 +08:00
chris meyers d0c5c3d3cf add work_unit_id to job lifecycle 2021-11-10 08:50:16 +08:00
chris meyers 9f8250bd47 add events to job lifecycle 
* Note in the job lifecycle when the controller_node and execution_node
  are chosen. This event occurs most commonly in the task manager with a
  couple of exceptions that happen when we dynamically create dependenct
  jobs on the fly in tasks.py
 2021-11-10 08:50:16 +08:00
Alan Rominger 3a3fffb2dd Fixed error dropped on floor - save receptor detail when it applies 2021-11-10 08:50:16 +08:00
nixocio 4cfa4eaf8e Update validators for Misc Auth Edit 
* Update SharedFields to use number validator instead of integer
* Use number validation for SESSIONS_PER_USER

See: https://github.com/ansible/tower/issues/5396
 2021-11-10 08:50:16 +08:00
Kersom abb1125a2c Display host name for Associate Modal (#5407) 
Display host name for Associate Modal

See: https://github.com/ansible/awx/issues/11256
 2021-11-10 08:50:16 +08:00
Alan Rominger a2acbe9fe6 Fix incorrect (changed: True) frequent in OCP task logs 2021-11-10 08:50:16 +08:00
Alex Corey cab8c690d2 Adds instances to aactivty stream 2021-11-10 08:50:16 +08:00
Alan Rominger 0d1f8a06ce Revert default EE authfile support for inventory_import 2021-11-10 08:50:15 +08:00
Alan Rominger d42fe921db Re-order authfile option to make inventory import command work 2021-11-10 08:50:15 +08:00
Kersom db7fb81855 Fix login redirect (#5386) 
Allows the user to visit login page when the login redirect url is set.

Also, redirects to login page once logging out and there is session from
a SAML available.

See: https://github.com/ansible/awx/issues/11012
 2021-11-10 08:50:15 +08:00
Jeff Bradberry d3c695b853 Clean up some scar tissue left behind 
by the initial use of the black code formatter.
 2021-11-10 08:50:15 +08:00
Jeff Bradberry 010c3ab0b8 Fix a typo in inventory_import 
ExecutionEnvironment.credential got shortened to .cred.
 2021-11-10 08:50:15 +08:00
Bianca Henderson 58cdbca5cf Update error message to be more accurate 2021-11-10 08:50:15 +08:00
Bianca Henderson 8275082896 Update error messages for when exceptions are caught 2021-11-10 08:50:14 +08:00
Bianca Henderson d79da1ef9f Catch exceptions that might pop up when releasing work units 2021-11-10 08:50:14 +08:00
Jeff Bradberry a9636426b8 Make the inventory_import command respect the default EE and credential 2021-11-10 08:50:14 +08:00
Alan Rominger 329caad681 In admin reaper skip work units w/o params 2021-11-10 08:50:14 +08:00
Alan Rominger ecb84e090c Revert "Merge pull request #5354 from ansible/jobs_killed_via_receptor_should_get_reaped" 
This reverts commit 8736858d808402d4520112153414bd875cf5cfe7, reversing
changes made to 84e77c9db9f8ec2a781be8da834256b350e865f2.
 2021-11-10 08:50:14 +08:00
nixocio 8e9fc14b0e Fix SAML variables default values 
Fix SAML variables default values

See: https://github.com/ansible/tower/issues/5372
 2021-11-10 08:50:14 +08:00
Jim Ladd 0f77ca605d add unit tests 2021-11-10 08:50:14 +08:00
Jim Ladd 231fcc8178 drop lines picked up during merge resolution 2021-11-10 08:50:13 +08:00
Alan Rominger 2839091b22 Avoid extra check if we have job_explanation 2021-11-10 08:50:13 +08:00
Alan Rominger 47e67481b3 Avoid reaping tentative jobs 2021-11-10 08:50:13 +08:00
Alan Rominger 55059b015f Avoid resultsock shutdown before reading from it 2021-11-10 08:50:13 +08:00
Alan Rominger eb6c58682d Alternative for reaping lost jobs, in work unit reaper 2021-11-10 08:50:13 +08:00
Jim Ladd 26055de772 cancel job if receptor no longer knows about the work item 2021-11-10 08:50:13 +08:00
Jim Ladd ebb4581595 update exception log message to be descriptive 
.. instead of surfacing exception
 2021-11-10 08:50:12 +08:00
Jim Ladd d1fecc11c9 when releasing receptor work, do so in try/except 2021-11-10 08:50:12 +08:00
Jeff Bradberry 056247a34a Adjust Instance-InstanceGroup tests to show that the ActivityStream is captured 2021-11-10 08:50:12 +08:00
Jeff Bradberry 7010015e8a Change the ActivityStream registration for InstanceGroups 
to include the m2m fields.  Also to avoid spamminess, disable the
activity stream on the apply_cluster_membership_policies task.
 2021-11-10 08:50:12 +08:00
Jeff Bradberry 62d50d27be Update a couple of the existing tests 2021-11-10 08:50:12 +08:00
Jeff Bradberry 1e5231d68b Enable ActivityStream capture for Instances 2021-11-10 08:50:12 +08:00
Seth Foster e04efad3c0 tools_receptor_1 should use whatever awx_devel tag that tools_awx_1 is using 2021-11-10 08:50:11 +08:00
Alan Rominger e54db3ce50 Gracefully handle receptorctl RuntimeError in health check 2021-11-10 08:50:11 +08:00
Alan Rominger 77076dbd67 Reduce the number of triggers for execution node health checks 2021-11-10 08:50:11 +08:00
Alan Rominger 6f20a798ab Allow testing a single hybrid instance like the good old days 2021-11-10 08:50:11 +08:00
Alex Corey 0d3a22bbc3 Fixes erroneous validation 2021-11-10 08:50:11 +08:00
Alan Rominger f34c96ecf5 Error handling when node is missing from mesh for jobs and checks 2021-11-10 08:50:11 +08:00
nixocio 206c85778e Do not show control instances as option to be associated 
Do not show control instances as option to be associated to user defined
instance groups.

See: https://github.com/ansible/tower/issues/5339
 2021-11-10 08:50:11 +08:00
Marcelo Moreira de Mello d6b4b9f973 Added node_type on awx-manage list_instances commmand 
(cherry picked from commit 683145e3eaa8b13da59bc51e57dff98f25d3554d)
 2021-11-10 08:50:10 +08:00
chris meyers 3065e29deb avoid work_results and work release race 
* Unsure exactly why this happens but there seems to be a race condition
  related to the time window between Receptor work_results and work
  release. This sleep extends that window and hopefully avoids the race
  condition.
 2021-11-10 08:50:10 +08:00