External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 17:00:12 -02:30
Code Issues Packages Projects Releases Wiki Activity
12,322 Commits 63 Branches 102 Tags
6d92c56da5646a038973e7306f575212681915ad
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AlanCoding 6d92c56da5 SCM Inventory model, view, and task system changes 
Inventory source file-type combined with a linked project
will allow the inventory source to be updated when the
project is updated. The inventory update runs in the
post-run hook of the project update.
 2017-04-17 15:01:19 -04:00
Alan Rominger 14a03d2cb5 Merge pull request #6029 from AlanCoding/group_v1 
Group serializer special v1 functionality
 2017-04-17 11:37:26 -04:00
AlanCoding 7223177684 Group serializer special v1 functionality 
Returns a related `inventory_source` and related link for groups
if accessed from /api/v1/, but not for API v2.
Also inserts corresponding fields to inventory source serializer.
Keep migrated manual sources and auto-create in API v1.
 2017-04-17 10:30:07 -04:00
Alan Rominger 4c5222b16b Merge pull request #6007 from AlanCoding/inv_src_changelog 
Add removal of inventory_source link to CHANGELOG
 2017-04-13 10:58:11 -04:00
Alan Rominger 047672a5b7 Merge pull request #5914 from AlanCoding/ii_tests 
Port inventory_import tests to new system
 2017-04-12 15:07:56 -04:00
AlanCoding d77c8ec88e add removal of inventory_source link to CHANGELOG 2017-04-12 11:43:50 -04:00
AlanCoding 0aab8b6713 Port basic inventory_import command tests over to new system 2017-04-12 11:16:35 -04:00
Alan Rominger 3c79e5cfe2 Merge pull request #6003 from AlanCoding/inventory_update_update 
Update inventory_update to group-less inventory sources
 2017-04-12 10:22:40 -04:00
AlanCoding a2ffbafea8 Update inventory_update to group-less inventory sources 2017-04-12 10:10:16 -04:00
Alan Rominger b6eac59aa5 Merge pull request #6004 from ansible/AlanCoding-patch-1 
Remove async from logging test kwargs
 2017-04-12 09:31:37 -04:00
Alan Rominger f3dd7f7987 Remove async from logging test kwargs 2017-04-12 09:22:50 -04:00
AlanCoding 933bc81dc2 Add bzip2 to Dockerfile yum install line 2017-04-10 08:11:06 -04:00
Alan Rominger e0d6298460 Merge pull request #5977 from AlanCoding/bzip2 
Install bzip2 so makefile targets to build frontend work
 2017-04-07 15:36:23 -04:00
AlanCoding 5078ed077a install bzip2 so makefile targets to build frontend work 2017-04-07 11:24:17 -04:00
Alan Rominger cc476541a1 Merge pull request #5946 from AlanCoding/work_success_except 
Handle error of missing jobs in success callback
 2017-04-04 13:54:09 -04:00
AlanCoding 33c1de26b5 handle error of missing jobs in success callback 2017-04-03 21:11:54 -04:00
Alan Rominger f3a3a4c1d5 Merge pull request #5941 from AlanCoding/port_not_req 
update test to fact that logger port is not required
 2017-04-03 12:24:40 -04:00
AlanCoding ec21505fea update test to fact that logger port is not required 2017-04-03 11:56:41 -04:00
Alan Rominger d2795c4784 Merge pull request #5434 from AlanCoding/activity_hygiene 
avoid multi-field implicit role activity stream entries
 2017-03-24 12:26:32 -04:00
AlanCoding 49faf212ef consolidate RBAC is_implicit_parent code 2017-03-24 09:25:24 -04:00
AlanCoding 169384ddbe Start RBAC unit testing system to test is_implicit_parent 2017-03-23 15:57:50 -04:00
Alan Rominger a5d23e7c80 Merge pull request #5851 from AlanCoding/vars_and_words 
Always word the variables parsing error the same way
 2017-03-22 18:45:29 -04:00
AlanCoding 99fc0e8264 Use consistent error message when vars are not parsed correctly 2017-03-22 16:37:20 -04:00
AlanCoding bb292f817b move check for implicit parent role into fields.py 2017-03-22 16:30:15 -04:00
AlanCoding b01b12ab2a avoid multi-field implicit role activity stream entries 2017-03-22 15:22:48 -04:00
Alan Rominger 83bc654b15 Merge pull request #5812 from AlanCoding/no_loops_for_hackers 
Block loops in querystring filters
 2017-03-21 10:50:35 -04:00
AlanCoding 925712e3ec block users from making looping filters which can DoS Tower 2017-03-21 10:16:49 -04:00
AlanCoding 0046421f05 set log formatter message type 2017-03-07 16:48:48 -05:00
Alan Rominger 9e109019fe Merge pull request #5574 from AlanCoding/req_test_dev 
In requirements test, skip -e entries from pip freeze
 2017-03-01 09:21:43 -05:00
AlanCoding f90ba8e6a6 small refactor of python requirement test to work in dev env 2017-03-01 09:04:31 -05:00
Alan Rominger 8b383e788b Merge pull request #5560 from AlanCoding/dup_related 
Avoid duplicated related search fields
 2017-02-24 16:55:25 -05:00
AlanCoding 84e2f4d626 avoid duplicated related search fields 2017-02-24 16:49:54 -05:00
Alan Rominger 0bdcfbb33e Merge pull request #5512 from AlanCoding/inv_src_qs 
Add InventorySource back into schedule queryset
 2017-02-22 17:01:11 -05:00
Alan Rominger 1f0b3876cc Merge pull request #5506 from AlanCoding/no_bad_names 
More gutting of related_search_fields in 3.1 scope
 2017-02-22 16:52:56 -05:00
AlanCoding d85eda99c6 add back in Inv Src into schedule queryset computation 2017-02-22 15:34:18 -05:00
AlanCoding a69a4de51e prohibit additional items from related_search_fields 2017-02-22 13:32:05 -05:00
Alan Rominger 6039ad15af Merge pull request #5498 from AlanCoding/expire_tasks 
Expire certain beat tasks if not ran on schedule
 2017-02-21 17:10:26 -05:00
AlanCoding 7c5856cee6 set expiration time for the disposable system tasks 2017-02-21 15:54:18 -05:00
Alan Rominger 711bee9633 Merge pull request #5414 from AlanCoding/manage_context 
Disable activity stream in cleanup_jobs, test things
 2017-02-21 12:20:34 -05:00
AlanCoding 0bd606e26f remove unnecessary imports after context manager change 2017-02-21 12:08:03 -05:00
Alan Rominger c9e3fc3601 Merge pull request #5445 from AlanCoding/sub_ct_from_cache 
Allow UJT content type list to come from manager cache
 2017-02-21 10:33:21 -05:00
Alan Rominger 95e1caed56 Merge pull request #5443 from AlanCoding/vars_disp 
Prevent server error in /variables/ endpoint
 2017-02-20 22:29:08 -05:00
Alan Rominger 7d49d048e7 Merge pull request #5429 from AlanCoding/m2m_types 
Integer (or generic ForeignKey) coercion for m2m filters
 2017-02-20 22:25:57 -05:00
Alan Rominger 2b0f327523 Merge pull request #5458 from AlanCoding/migration_version 
add method to obtain the migration state of Tower
 2017-02-20 17:14:08 -05:00
AlanCoding a57d8fe9fd treat GFJ and FJ and M2M all the same for type in querystring 2017-02-20 17:11:08 -05:00
AlanCoding 87af8f7a38 add method to obtain the migration state of Tower 2017-02-20 13:17:21 -05:00
Alan Rominger 928d160f3d Merge pull request #5439 from AlanCoding/sys_aud_NT 
block system auditors from attaching notification templates
 2017-02-20 11:32:50 -05:00
AlanCoding 757982088c allow UJT content type list to come from cache 2017-02-17 22:08:18 -05:00
AlanCoding 1386fdeb1a prevent server error in /variables/ endpoint 2017-02-17 16:57:13 -05:00
AlanCoding 6d961d92c9 block system auditors from attaching notification templates 2017-02-17 16:17:07 -05:00
AlanCoding d8d874d964 treat m2m fields as FK in filter python coercion 2017-02-17 11:06:29 -05:00
Alan Rominger 68fc75070d Merge pull request #5348 from AlanCoding/dual_jt_count 
Update organization counts to correspond with UI lists
 2017-02-17 10:13:10 -05:00
Alan Rominger 377d6ebcab Merge pull request #5396 from AlanCoding/signal_intelligence 
Avoid a particular kind of nonsense activity stream entry
 2017-02-17 10:09:59 -05:00
Alan Rominger b25a040278 Merge pull request #5418 from AlanCoding/orphan_hack 
Make triple-sure that system admins can manage orphaned JTs
 2017-02-17 10:07:02 -05:00
AlanCoding 6b45aa758c fix special case where orphan JTs can not be edited by system admins in UI 2017-02-16 14:48:20 -05:00
AlanCoding 9e363d82d8 disable activity stream in cleanup_jobs and test context managers 2017-02-16 14:09:48 -05:00
AlanCoding d67dadd649 avoid activity stream entries of singleton implicit role associations 2017-02-16 10:22:21 -05:00
AlanCoding d687ff1be0 delete disable_signals fixture that is not being used 2017-02-15 15:34:14 -05:00
Alan Rominger 0e4f3c8015 Merge pull request #5376 from AlanCoding/logger_full_reload 
Add supervisor command to restart select services on reload event
 2017-02-15 15:19:27 -05:00
AlanCoding 3023b4dfaa switch to new nested with pattern from PR review 2017-02-15 14:58:04 -05:00
AlanCoding 7e3a5fd2c2 move reload functionality to its own file 2017-02-15 13:42:49 -05:00
AlanCoding 186b672e4f move service definition into settings 2017-02-15 12:07:30 -05:00
Alan Rominger b4b83e0248 Merge pull request #5342 from AlanCoding/unified_jobs_rel_m2m 
fixes for unified_jobs related m2m search listing
 2017-02-15 09:30:17 -05:00
AlanCoding d8f133d175 Add supervisor command to restart select services on reload event 2017-02-15 09:13:59 -05:00
Alan Rominger 02962698d7 Merge pull request #5370 from AlanCoding/invite_beat_to_join 
add celery beat to supervisor group
 2017-02-14 22:24:04 -05:00
AlanCoding d054f86652 update organization counts to correspond with UI lists 2017-02-14 14:05:23 -05:00
AlanCoding c3eff539d0 fixes for unified_jobs related m2m search listing 2017-02-14 08:59:02 -05:00
Alan Rominger 138b672ba0 Merge pull request #5316 from AlanCoding/supervisor_dev 
Add supervisor option to development environment
 2017-02-14 08:47:27 -05:00
AlanCoding 9a88091042 get supervisorctl to work in dev supervisor env 2017-02-13 17:36:35 -05:00
AlanCoding b5aad8cbed bypass the makefile target for most commands in dev supervisor 2017-02-13 17:36:35 -05:00
AlanCoding d1a71fb7be add supervisor option to development environment 2017-02-13 17:36:34 -05:00
Alan Rominger 3f0c42c1f6 Merge pull request #5329 from AlanCoding/disable_sig_jobs 
Disable computed fields in cleanup_jobs
 2017-02-13 17:35:24 -05:00
Alan Rominger 0d396384bc Merge pull request #5334 from AlanCoding/orphan_wfjt_cap 
Special case for user capability with null WFJT organization
 2017-02-13 17:06:50 -05:00
Alan Rominger 42184d2416 Merge pull request #5333 from AlanCoding/jt_related_search 
Surface labels related search for job templates
 2017-02-13 17:03:01 -05:00
AlanCoding 770580b612 special case for user capability with null WFJT organization 2017-02-13 16:25:05 -05:00
Alan Rominger c5da81eb19 Merge pull request #5305 from AlanCoding/celery_dynamic_option 
Get celery logging autoreload + don't reconfigure the whole config
 2017-02-13 16:22:40 -05:00
AlanCoding fbe712dcd1 refactor adding logger loop from PR review 2017-02-13 15:45:05 -05:00
AlanCoding 603dfea580 get rid of HTTPSHandler subclass which is not needed 2017-02-13 15:07:33 -05:00
AlanCoding 31098d1b5d surface labels related search for job templates 2017-02-13 14:34:40 -05:00
AlanCoding b0e992d6ab disable computed field signals in cleanup_jobs 2017-02-13 12:34:21 -05:00
AlanCoding d912013db7 fix some bugs with the logging reload approach 2017-02-10 15:57:24 -05:00
AlanCoding cdf28f1bca remove old logger reconfig method 2017-02-10 11:54:19 -05:00
AlanCoding 91031cbbc8 modularize logging config in proper Django fashion 2017-02-10 11:38:32 -05:00
Alan Rominger 0234d7676d Merge pull request #5285 from AlanCoding/fifo2 
Get uWSGI reloading working in dev environment
 2017-02-09 15:56:47 -05:00
Alan Rominger 8c1be80215 Merge pull request #5277 from AlanCoding/various_logging_updates 
Update logging docs & switch out null logger
 2017-02-09 15:56:09 -05:00
AlanCoding 1d6a36876b have tasks.py deduce location of uwsgi fifo 2017-02-09 15:27:58 -05:00
AlanCoding 279546e110 make obvious updates to the logging related docs 2017-02-09 12:37:57 -05:00
AlanCoding 1c6f037076 stop using Django NullHandler which is being removed in future version 2017-02-09 11:53:51 -05:00
Alan Rominger 90cbfb3cf2 Merge pull request #5234 from AlanCoding/im_the_boss_but_pretend_to_be_one_of_the_members 
switcharoo of team admin for member role
 2017-02-08 16:53:36 -05:00
Alan Rominger b21513754d Merge pull request #5245 from AlanCoding/inv_src_cred 
check related credential for inventory source
 2017-02-08 13:47:24 -05:00
AlanCoding f60f1fdcc4 check related credential for inventory source 2017-02-08 13:16:02 -05:00
AlanCoding 07773bb19e Remove unsuported team indirect access from test 
Add in team admin_role in its place
confirm that team admin looks the same as team member
 2017-02-08 11:43:38 -05:00
AlanCoding 99b7532ef6 switcharoo of team admin for member role 2017-02-07 17:43:43 -05:00
Alan Rominger 5d45e01219 Merge pull request #5211 from AlanCoding/orphan_jt 
Fix bug with system auditors and detail view of orphaned JT
 2017-02-07 17:01:13 -05:00
Alan Rominger a7e43034d7 Merge pull request #5213 from AlanCoding/dry_run 
Surface dry_run option for system jobs through the API
 2017-02-07 13:41:58 -05:00
AlanCoding 93034ef1d6 surface dry_run option for system jobs through the API 2017-02-07 10:37:41 -05:00
AlanCoding e5a8eb95b2 fix bugs with system auditors and orphan JTs 2017-02-07 09:18:23 -05:00
Alan Rominger 5a1b56af42 Merge pull request #5202 from AlanCoding/pretty_sys_jobs 
aesthetic editing of system job output
 2017-02-07 08:41:50 -05:00
AlanCoding b2f5b82610 aesthetic editing of system job output 2017-02-06 15:15:00 -05:00
Alan Rominger 68d9457de9 Merge pull request #5205 from AlanCoding/fail_inconsistent_system_jobs 
Allow system jobs to get sucked up in the fail inconsistent task cleanup
 2017-02-06 15:13:52 -05:00