External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 03:10:42 -03:30
Code Issues Packages Projects Releases Wiki Activity
12,954 Commits 54 Branches 19 Tags
Commit Graph

12954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Meyers
775093294e run host listing through v1 vs. v2 logic 
* api/v1/hosts related fields were getting v2 in the related urls. The
context is now included in the serializer instantiation.
 2017-04-17 11:43:44 -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
gconsidine
6c06344fdb Fix permission modal in team settings 
A GET request is made to check permissions on job templates, workflow
templates, inventories, etc. With a basic license, the workflow
template request returns a 402. The logic in place accounted for
500-ish errors and 200s. Now if a 402 response is returned, it's
excluded from the UI without affecting the other successful responses.
 2017-04-17 11:22:03 -04:00
Aaron Tan
30193ffea5 Merge pull request #5970 from jangsutsr/5628_update_ctit_serializer_fields_to_handle_html_cornercase 
Update CTinT serializer integer field to handle html cornercase
 2017-04-17 11:21:02 -04:00
Alan Rominger
6d17158b34 Merge pull request #5973 from AlanCoding/survey_choices_string 
When survey choices are strings, don't just check "X in choices"
 2017-04-17 11:05:50 -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
Chris Meyers
4b537870b4 Merge pull request #6030 from chrismeyersfsu/fix-6016 
add json a=null support and still support a="null"
 2017-04-16 21:09:58 -04:00
Chris Meyers
5ff4966526 add json a=null support and still support a="null" 
related to #6016
 2017-04-13 16:26:35 -04:00
Chris Meyers
f20bf127b4 Merge pull request #6028 from chrismeyersfsu/fix-multiple_and_or 
support > 2 sequential and, also or
 2017-04-13 13:48:45 -04:00
Chris Meyers
040f9dd545 support > 2 sequential and, also or 
* Fixed a bug in the fact search language parser where it would not loop
over all the <and, or> operations. The result, we can support (a=b or
a=c or a=d) also support (a=b and b=b and c=b)
 2017-04-13 13:36:38 -04:00
Alan Rominger
7dd69a36d8 Merge pull request #6017 from AlanCoding/supervisor_verbosity 
Add supervisorctl logs
 2017-04-13 11:07:41 -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
Chris Meyers
56442b2364 Merge pull request #6014 from chrismeyersfsu/improvement-graceful_query_fail 
400 on invalid host filter query instead of 500
 2017-04-13 10:52:24 -04:00
Chris Meyers
23ce5ab9de fix up test 2017-04-13 10:44:28 -04:00
Aaron Tan
250ffca3ea Merge pull request #5920 from jangsutsr/5762_tacacsplus_auth_backend 
A working TACACS+ backend and related CTiT settings
 2017-04-13 10:42:25 -04:00
Chris Meyers
bd1f8b088f 400 on invalid host filter query instead of 500 2017-04-13 09:40:11 -04:00
AlanCoding
6f0a8949a6 Add supervisorctl logs 
In some systems, the tower service process may not have sufficient
permissions to communicate with the supervisorctl socket, in which
case an automated restart will not be possible.
 2017-04-12 16:46:58 -04:00
Aaron Tan
07198a5ba6 Acceptance Docs. 2017-04-12 16:19:42 -04:00
Aaron Tan
fd4aaa6ca9 Implement tacacs+ auth backend. 2017-04-12 16:19:42 -04:00
Aaron Tan
f2c99eeaf5 Basic tacacs+ CTiT. 2017-04-12 16:19:42 -04:00
Aaron Tan
84c6d41bd4 Merge pull request #6013 from ryanpetrello/tacacs_requirements 
add tacacs_plus package as a dependency
 2017-04-12 15:44:40 -04:00
Ryan Petrello
9f46b3c704 add tacacs_plus package as a dependency 2017-04-12 15:39:11 -04:00
Chris Meyers
1a2cbaf5e1 flake8 fix 2017-04-12 15:35:42 -04:00
Chris Meyers
a2b37aa7e6 add not logic to json search 
* Also fix up single contains [] logic. Values with a single contains
should be wrapped in [] and not, like I thought before, \"\"
 2017-04-12 15:11:36 -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
Chris Meyers
817ca503e8 Merge pull request #6002 from chrismeyersfsu/fix-5984 
lock projects on project sync
 2017-04-12 13:25:51 -04:00
AlanCoding
d77c8ec88e add removal of inventory_source link to CHANGELOG 2017-04-12 11:43:50 -04:00
Chris Meyers
70fafe75d2 clean up commented code 2017-04-12 11:42:31 -04:00
Chris Meyers
d1eba4b607 log lock errors and test it 2017-04-12 11:41:11 -04:00
AlanCoding
0aab8b6713 Port basic inventory_import command tests over to new system 2017-04-12 11:16:35 -04:00
Michael Abashian
5e9522322c Merge pull request #5998 from mabashian/5947-copy-move-host-pagination 
Fixed copy/move groups/hosts pagination bug
 2017-04-12 10:23:54 -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
Chris Meyers
7919c47370 put lock file in project root dir 2017-04-12 09:36:15 -04:00
Greg Considine
037731e3e9 Merge pull request #5999 from gconsidine/uxi/padding-audit 
Fix padding/margin related issues throughout
 2017-04-12 09:35:46 -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
gconsidine
3db3fb28d6 Add padding for list action buttons 2017-04-11 17:07:39 -04:00
Ryan Petrello
f6510dbd4a Merge pull request #5983 from ryanpetrello/release_3.1.3 
Be more restrictive in catching LDAP exceptions.
 2017-04-11 16:52:53 -04:00
Ryan Petrello
d1eb33bca0 Be more restrictive in catching LDAP exceptions. 
django-auth-ldap can throw exceptions, like TypeError if it's
misconfigured.  If we encounter an exception attempting to log into an
LDAP server, log it and move on (otherwise, an uncaught exception will
cause local login to fail, too).

see: #5933
 2017-04-11 16:43:26 -04:00
Wayne Witzel III
72222bf367 Merge pull request #5974 from wwitzel3/issue-5741 
Remove group AutoOneToOne from InventorySource
 2017-04-11 15:54:39 -04:00
Chris Meyers
648aa470d7 lock projects on project sync 
* Use filesystem, blocking, locks to prevent two project syncs for the
same project from running the project update playbook at the same time.
 2017-04-11 15:47:46 -04:00
Wayne Witzel III
7cabe45e63 Create a new 3.2 data migration file and adjust logging. 2017-04-11 15:43:29 -04:00
Michael Abashian
c3d002cc0f Fixed min/max length survey password bug where password had default and min > 12 2017-04-11 15:13:13 -04:00
Aaron Tan
9027616420 Merge pull request #5989 from jangsutsr/5986_prevent_unexpected_callback_module_attribute_warning 
Prevent unexpected callback module attribute warning
 2017-04-11 14:54:38 -04:00
Wayne Witzel III
91f3e665cb group -> deprecated_group, added migrations, added/removed tests 2017-04-11 14:09:04 -04:00
Wayne Witzel III
7458788562 More updates for InventorySource changes 2017-04-11 14:04:25 -04:00
Wayne Witzel III
c905d98b9e Restore missing facts latest migration 2017-04-11 14:04:25 -04:00
Wayne Witzel III
4b5b56c284 Fixing test fallout from InventorySource model change 2017-04-11 14:04:25 -04:00
Wayne Witzel III
c784c96449 Initial removal of InventorySource.group 2017-04-11 14:04:25 -04:00