External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
12,567 Commits 65 Branches 102 Tags
d826c45ac6442ae1c42118858d01efa879a4239c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III 17b18f3d85 Merge pull request #6173 from wwitzel3/devel 
Add organization to the InventorySource fields
 2017-05-03 15:35:26 -04:00
Wayne Witzel III 0134b7e0bd Add organization to the InventorySource fields 2017-05-03 15:29:21 -04:00
Wayne Witzel III 465d620629 Merge pull request #6163 from wwitzel3/issue-5922 
Remove deprecated fields / old migration tests.
 2017-05-03 10:42:13 -04:00
Wayne Witzel III 9f28c57521 Remove all CONSTANTS 2017-05-03 10:27:32 -04:00
Wayne Witzel III dd52e2be30 Add migration and restore Credential logic 2017-05-02 22:49:17 -04:00
Wayne Witzel III 11eb99820d Initial pass of removing RBAC deprecated fields and Permission 2017-05-02 22:38:34 -04:00
Wayne Witzel III 65b7e7e839 Merge pull request #6144 from wwitzel3/issue-5745 
Support dynamic Inventory
 2017-05-02 13:28:48 -04:00
Wayne Witzel III e46a043213 Revert isinstance, circular imports due to when the HostManager exists for an Inventory 2017-05-02 13:16:53 -04:00
Wayne Witzel III af35838aff Make kind read-only for PUT/PATCH, use isinstance in Host Manager, update field fasly check 2017-05-02 13:00:17 -04:00
Wayne Witzel III bdb13ecd71 Merge in latest DynamicFilter changes 2017-05-01 13:38:39 -04:00
Wayne Witzel III 1750e5bd2a Refactor Host manager and dynamic Inventory tests and update 
validation/serialization
 2017-05-01 13:06:49 -04:00
Wayne Witzel III 8a599d9754 Add Inventory.kind field 2017-05-01 12:55:42 -04:00
Wayne Witzel III a45d41b379 DynamicFilterQuerySet -> DynamicFilter 2017-05-01 12:55:42 -04:00
Wayne Witzel III 17e9b3057e Clean-up intiail commit for Host filter / DynamicInventory 2017-05-01 12:55:42 -04:00
Wayne Witzel III 64982461ac Merge pull request #6124 from wwitzel3/devel 
Add inventory_id to websocket data
 2017-04-28 14:02:40 -04:00
Wayne Witzel III b651983045 also add inventory_source_id to websocket data 2017-04-28 12:22:49 -04:00
Wayne Witzel III 1248be9b7c Add inventory_id to websocket data 2017-04-28 11:50:07 -04:00
Wayne Witzel III c058f76960 value_to_python should encode lookup fields as ascii 2017-04-20 13:22:54 -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
Wayne Witzel III 7cabe45e63 Create a new 3.2 data migration file and adjust logging. 2017-04-11 15:43:29 -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
Wayne Witzel III e750f1a01c Merge pull request #5892 from wwitzel3/release_3.1.2 
Do not set the default if field was not passed in to kwargs_extra_vars.
 2017-03-27 09:50:35 -04:00
Wayne Witzel III 45c3a389d4 add test, restore old behavior in api test 2017-03-27 09:39:21 -04:00
Wayne Witzel III 18eaacf4bb create _survey_element_validation and use it for updating extra_vars 2017-03-24 17:57:52 -04:00
Wayne Witzel III c99d4659da Do not set the default if the field was not passed in to kwargs_extra_vars 2017-03-24 16:59:43 -04:00
Wayne Witzel III 3b1556c0d5 Merge pull request #5709 from wwitzel3/issue-5702 
correct unintentional stripping of - from order by fields
 2017-03-13 22:35:18 -04:00
Wayne Witzel III ea1c4ee1d5 correct unintentional stripping of - from order by fields 2017-03-13 18:13:55 -04:00
Wayne Witzel III 4fef391914 Merge pull request #5660 from wwitzel3/release_3.1.2 
do not install psql as a tower dep
 2017-03-13 16:43:23 -04:00
Wayne Witzel III 2918bf0180 Merge pull request #5664 from wwitzel3/issue-5608 
value_to_python should encode lookup fields as ascii
 2017-03-08 14:20:13 -05:00
Wayne Witzel III 27fc64eb56 value_to_python should encode lookup fields as ascii 2017-03-08 12:30:30 -05:00
Wayne Witzel III 87da7d6a93 Merge pull request #5591 from wwitzel3/release_3.1.1 
update asgi_amqp version
 2017-02-28 16:04:30 -05:00
Wayne Witzel III 9eed328107 update asgi_amqp version 2017-02-28 14:03:52 -05:00
Wayne Witzel III c919f1ef30 Merge pull request #5487 from wwitzel3/issue-5341 
explicit ordering in workflow_nodes views
 2017-02-27 10:06:58 -05:00
Wayne Witzel III a04411817f refactor based on review 2017-02-24 17:12:40 -05:00
Wayne Witzel III ebd4064b82 Merge pull request #5561 from wwitzel3/release_3.1.0 
Make current_groups a set, update asgi-amqp req
 2017-02-24 17:08:02 -05:00
Wayne Witzel III 4d02ee9445 Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement 2017-02-24 16:59:39 -05:00
Wayne Witzel III 1d74b4ea9b Merge pull request #5551 from wwitzel3/release_3.1.0 
run clustered as privleged to avoid namespace error
 2017-02-24 11:19:28 -05:00
Wayne Witzel III 50f187b78c run clustered as privleged to avoid namespace error 2017-02-24 11:12:39 -05:00
Wayne Witzel III 87e0c9020f explicit ordering in workflow_nodes views 2017-02-21 02:33:45 -05:00
Wayne Witzel III fd82f4280c Merge pull request #5442 from wwitzel3/issue-5441 
make OrderingFilter part of our default filters
 2017-02-17 16:24:20 -05:00
Wayne Witzel III a55e79e94d make OrderingFilter part of our default filters 2017-02-17 16:16:28 -05:00
Wayne Witzel III a44fc6847c Merge pull request #5375 from wwitzel3/issue-5341 
Ensure WorkflowJobWorkflowNodesList orders correctly, default by PK
 2017-02-16 01:25:09 -05:00
Wayne Witzel III cd35d64118 Ensure WorkflowJobWorkflowNodesList orders correctly, default by PK 2017-02-15 06:53:20 -05:00
Wayne Witzel III df4fe4df2b Merge pull request #5327 from wwitzel3/issue-4730 
Allow execute role to see their schedules
 2017-02-13 12:51:53 -05:00
Wayne Witzel III ee25be1e67 Allow execute role to see their schedules 2017-02-13 12:34:47 -05:00
Wayne Witzel III 1851276b10 Merge pull request #5271 from wwitzel3/release_3.1.0 
Rewrite type to polymorphic_ctype__model for certain filter requests
 2017-02-09 11:42:19 -05:00
Wayne Witzel III 0562e4baad Rewrite type to polymorphic_ctype__model for certain filter requests 2017-02-09 09:55:25 -05:00
Wayne Witzel III 753cbf18e1 Merge pull request #5206 from wwitzel3/release_3.1.0 
fix functional job runtime params tests
 2017-02-06 15:02:55 -05:00
Wayne Witzel III dee359254f fix functional job runtime params tests 2017-02-06 14:50:51 -05:00
Wayne Witzel III 978a5fbcdc Merge pull request #5156 from wwitzel3/issue-5036 
only assign the default if it is not None
 2017-02-02 14:53:36 -05:00
Wayne Witzel III ec86961e13 only assign the default if it is not None 2017-02-02 14:48:31 -05:00
Wayne Witzel III 71c190e025 Merge pull request #5122 from wwitzel3/release_3.1.0 
remove check of http_session, not needed with auth_token
 2017-02-02 10:13:40 -05:00
Wayne Witzel III 70f8dfe8fe remove use of http_session, not needed with auth_token 2017-02-01 12:59:09 -05:00
Wayne Witzel III eada4ce83f Merge pull request #5095 from jaredevantabor/remove-token-from-sockets 
removing token from websocket connection url
 2017-02-01 09:27:22 -05:00
Wayne Witzel III d6ac673b3f Merge pull request #5101 from wwitzel3/issue-4978 
users from the http_session and /websocket RBAC
 2017-02-01 09:27:01 -05:00
Wayne Witzel III 9e7ae673b6 rework authentication to respect all possible backends using DRF auth_token 2017-02-01 00:21:18 -05:00
Wayne Witzel III 36c06020b4 Get users from the http_session, authorize job, workflow, and adhoc event access against RBAC 2017-01-31 20:19:45 -05:00
Wayne Witzel III e0d9a2aed7 Merge pull request #5041 from wwitzel3/issue-5035 
fix KeyError for default, added tests
 2017-01-30 13:40:18 -05:00
Wayne Witzel III 755e408cd9 fix fields with no defaults showing in extra_vars display when not provided 2017-01-30 13:29:55 -05:00
Wayne Witzel III 5ace8dad4e fix KeyError for default, added tests 2017-01-30 12:15:43 -05:00
Wayne Witzel III 7807ee09f9 Merge pull request #4915 from wwitzel3/issue-4636 
Mask the default value for password fields in survey_spec.
 2017-01-27 02:37:16 -05:00
Wayne Witzel III df9bb829fc fix KeyError with spec 2017-01-24 16:53:48 -05:00
Wayne Witzel III fba1fa83d0 reduce, reuse, recycle 2017-01-24 16:44:42 -05:00
Wayne Witzel III 735f5d14b3 ensure that launching respects default values 2017-01-24 16:39:41 -05:00
Wayne Witzel III cf6c4fe7ac mask the default value for survey_spec password fields 2017-01-24 13:03:57 -05:00
Wayne Witzel III 8625d670ac Merge pull request #4745 from wwitzel3/release_3.1.0 
remove extra censoring code from tower, not needed since Ansible 2.1+
 2017-01-16 20:29:44 -05:00
Wayne Witzel III 9592c67c31 fixing flake8 errors 2017-01-16 14:16:24 -05:00
Wayne Witzel III cd5eed9828 remove extra censoring code from tower, not needed since Ansible 2.1+ 2017-01-16 13:54:07 -05:00
Wayne Witzel III f95f75c55a Merge pull request #4435 from wwitzel3/release_3.1.0 
use DjangoJSONEncoder
 2016-12-14 13:13:13 -05:00
Wayne Witzel III 13798d352c use DjangoJSONEncoder 2016-12-14 12:49:50 -05:00
Wayne Witzel III f6a7b4c673 Merge pull request #4409 from wwitzel3/release_3.1.0 
squashed migrations to allow for migration removal after 3.1 release
 2016-12-13 14:51:23 -05:00
Wayne Witzel III 434b0f1f25 remove unneeded data migrations from squashed migrations 2016-12-13 14:42:24 -05:00
Wayne Witzel III 384dbb6da2 renamed squashed migrations to start at 0002 2016-12-13 14:41:23 -05:00
Wayne Witzel III d79748bda7 Merge pull request #4414 from wwitzel3/r310 
allow API requests from localhost/127.0.0.1 to be insecure
 2016-12-13 13:53:58 -05:00
Wayne Witzel III a8217ae3d3 adding squashed migrations to allow for migration removal after 3.1 release 2016-12-13 11:53:36 -05:00
Wayne Witzel III 2069473534 allow API requests from localhost/127.0.0.1 to be insecure 2016-12-13 11:47:13 -05:00
Wayne Witzel III 623d0a8df6 Merge pull request #4398 from wwitzel3/release_3.1.0 
Consolidate 3.1 migrations.
 2016-12-13 08:38:31 -05:00
Wayne Witzel III c9dab5805d update imports and further consolidate 2016-12-12 19:22:09 -05:00
Wayne Witzel III 83b985ed2e tower settings removal depends on conf migration 2016-12-12 19:21:10 -05:00
Wayne Witzel III 783e86bd41 Consolidate 3.1.0 migrations 2016-12-12 19:21:08 -05:00
Wayne Witzel III 824fb21b3f Merge pull request #4357 from wwitzel3/release_3.1.0 
Update uwsgi/nginx configurations.
 2016-12-12 14:08:01 -05:00
Wayne Witzel III 19f7d9e8d8 redirect if no forward-slash 2016-12-12 13:25:10 -05:00
Wayne Witzel III c6e1598b9c explicitly set long harakiri time to deal with very large inventory deletes 2016-12-12 12:44:05 -05:00
Wayne Witzel III fafec3a0e3 Update to use Modern values for SSL 2016-12-12 12:42:56 -05:00
Wayne Witzel III 5f5624c5a3 Update to use Modern values for SSL 2016-12-12 12:42:53 -05:00
Wayne Witzel III 88dc742f42 update uwsgi/nginx production configuration 2016-12-12 12:42:51 -05:00
Wayne Witzel III 4c8af2a4b8 update uwsgi/nginx dev configuration 2016-12-12 12:42:20 -05:00
Wayne Witzel III 25915eb55a Merge pull request #4039 from wwitzel3/workflow-channels 
Workflow Event Channels Integration
 2016-11-18 14:41:40 -05:00
Wayne Witzel III d882a14d87 fix group_name for workflow_events 2016-11-17 17:22:31 -05:00
Wayne Witzel III cd084f5c60 removed JobEventSerializer additions, consolidated migrations, swapped job_events and jobs channel updates 2016-11-17 17:03:41 -05:00
Wayne Witzel III 62d0b9fc98 Merge branch 'devel' into workflow-channels 2016-11-17 16:22:52 -05:00
Wayne Witzel III 9dda4d452f renamed Workflow channel migration 2016-11-16 11:02:35 -05:00
Wayne Witzel III 34439fed9d Merge branch 'devel' into workflow-channels 2016-11-16 11:01:10 -05:00
Wayne Witzel III 6d14af336c added Workflow migrations for channels integrations 2016-11-16 09:51:31 -05:00
Wayne Witzel III 9fb4e75711 update websockets documentation 2016-11-16 09:43:56 -05:00
Wayne Witzel III a80e54a62e Merge branch 'devel' into workflow-channels 2016-11-14 16:03:22 -05:00