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
14,828 Commits 63 Branches 102 Tags
827cea53e4506d15592ef95090814a557ba228cc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III 0b0afe91ab Merge pull request #457 from wwitzel3/release_3.2.0 
get_or_create already saves, no need to call again
 2017-09-22 16:42:47 -04:00
Wayne Witzel III 39cc427668 get_or_create already saves, no need to call again 2017-09-22 16:25:55 -04:00
Wayne Witzel III 9e9692971f Merge pull request #455 from wwitzel3/release_3.2.0 
Various SAML / auth fixes.
 2017-09-22 16:10:49 -04:00
Wayne Witzel III e9e027ecd7 Fix issue when the enterprise_auth has already been created 2017-09-22 15:58:39 -04:00
Wayne Witzel III 723449818d Fix issue when per user tokens are disabled 2017-09-22 15:58:26 -04:00
Wayne Witzel III 7960525c20 Merge pull request #440 from wwitzel3/release_3.2.0 
Merge pull request #224 from wwitzel3/fix-shared-deps
 2017-09-20 16:50:08 -04:00
Wayne Witzel III 439beeab3b Merge pull request #224 from wwitzel3/fix-shared-deps 
Fix job shared dependencies.
 2017-09-20 14:56:22 -04:00
Wayne Witzel III c868f7e91f Merge pull request #435 from wwitzel3/release_3.2.0 
just fall through to the DjangoStrategy constructor
 2017-09-20 09:02:58 -04:00
Wayne Witzel III bab4cbbcf7 just fall through to the DjangoStrategy constructor 2017-09-20 08:50:39 -04:00
Wayne Witzel III 540bda1d09 Merge pull request #420 from wwitzel3/release_3.2.0 
Merge pull request #161 from wwitzel3/devel
 2017-09-18 09:54:54 -04:00
Wayne Witzel III dafd6acf1a Merge pull request #161 from wwitzel3/devel 
update social auth strategy to have fixes from social-app-django
 2017-09-15 17:22:32 -04:00
Wayne Witzel III 05b4bff388 Merge pull request #322 from wwitzel3/issue-7501 
Update HostManager to return distinct hostnames
 2017-08-22 16:31:57 -04:00
Wayne Witzel III ca9a1a0ca1 remove tests that execute distinct logic, sqlite3 does not support 2017-08-21 06:16:44 -04:00
Wayne Witzel III f8c2b466a8 sometimes core_filters is not an attribute, so just set it to empty instead of pop 2017-08-21 06:03:37 -04:00
Wayne Witzel III eb6a27653f Adjust HostManager and update summary host query 2017-08-21 04:01:58 -04:00
Wayne Witzel III c352ea7596 Update HostManager to return only a single matching hostname for SmartInventory filter 2017-08-21 02:17:27 -04:00
Wayne Witzel III ba1ed5b6fd Merge pull request #293 from wwitzel3/release_3.2.0 
Provide history to hosts that are part of smart inventory jobs.
 2017-08-17 09:58:32 -04:00
Wayne Witzel III 67c25570f3 Ensure Smart Inventory hosts are assigned job history 2017-08-16 17:04:17 -04:00
Wayne Witzel III 3ce0529846 Merge pull request #152 from wwitzel3/issue-7355 
Ensure hosts list properly when given read access to a smart inventory
 2017-08-02 15:41:13 -04:00
Wayne Witzel III eb73248d37 Refactor InventoryHostsList get_queryset to use getattrd 2017-08-02 15:13:27 -04:00
Wayne Witzel III 7f75ef9ad4 whitespace clean up 2017-08-02 13:11:16 -04:00
Wayne Witzel III fe36ed94b8 Ensure hosts list properly when given read access to a smart inventory 2017-08-02 13:10:55 -04:00
Wayne Witzel III 78ab549733 Merge pull request #115 from wwitzel3/issue-7332 
Disable caching for /authtoken endpoint
 2017-07-31 10:00:04 -04:00
Wayne Witzel III 7fe9c7b913 Disable caching for /authtoken endpoint 2017-07-31 09:19:54 -04:00
Wayne Witzel III 6856c77a8e Merge pull request #89 from wwitzel3/release_3.2.0 
Backout the token websocket changes, can of worms.
 2017-07-27 13:16:14 -04:00
Wayne Witzel III 5d167cafa2 Revert "Merge pull request #39 from wwitzel3/issue-7260" 
This reverts commit 6cd0592781, reversing
changes made to 943a40eb40.
 2017-07-27 11:32:09 -04:00
Wayne Witzel III 6cd0592781 Merge pull request #39 from wwitzel3/issue-7260 
Fixing cookie settings for CSRF and auth token
 2017-07-26 18:58:37 -04:00
Wayne Witzel III eff62a17a4 No longer require the token for channels 2017-07-26 13:57:14 -04:00
Wayne Witzel III f6d59409de Fixing cookie settings for CSRF and auth token 2017-07-25 10:11:52 -04:00
Wayne Witzel III 9799025a56 Merge pull request #7109 from ansible/squash-320 
Squash migrations v3.1 / v3.2
 2017-07-21 14:49:02 -04:00
Wayne Witzel III 822aa65207 Squash migrations 3.1 / 3.2 2017-07-21 13:24:14 -04:00
Wayne Witzel III 1a3131b1a8 Merge pull request #7128 from wwitzel3/issue-4040 
Set capacity to zero before shutting down older instances
 2017-07-18 13:40:52 -04:00
Wayne Witzel III 1a480f9895 Add a raise after stop_local_services just to be explicit 2017-07-18 10:30:42 -04:00
Wayne Witzel III 8cf3a2867c Set capacity to zero before shutting down older instances in the cluster. 2017-07-18 09:06:06 -04:00
Wayne Witzel III 2f82b3742d Merge pull request #7071 from wwitzel3/devel 
Update inventory_refresh acceptance docs
 2017-07-14 10:44:11 -04:00
Wayne Witzel III fe03181d4e update acceptance for /host/:id/smart_inventories 2017-07-14 10:43:25 -04:00
Wayne Witzel III 96cc714489 Update smart inventory acceptance 2017-07-14 10:41:06 -04:00
Wayne Witzel III 8cf3bb3134 Merge pull request #7058 from wwitzel3/host-smart_inventories 
Update how we repopulate the /host/:id/smart_inventories data
 2017-07-13 14:54:30 -04:00
Wayne Witzel III 6f1ef7fe0b Update how we repopulate the /host/:id/smart_inventories data 2017-07-13 14:04:33 -04:00
Wayne Witzel III 40fcd4240f Merge pull request #6995 from wwitzel3/devel 
Swap delay/save calls for schedule_deletion
 2017-07-11 17:01:59 -04:00
Wayne Witzel III 0ab5124b80 call the delayed delete after the save call for Inventory 2017-07-11 16:29:10 -04:00
Wayne Witzel III 363742b15e Merge pull request #6796 from wwitzel3/issue-4382 
Tweak background Inventory deletion.
 2017-06-29 09:26:23 -04:00
Wayne Witzel III ad95917db6 fix tests 2017-06-29 08:00:13 -04:00
Wayne Witzel III e9235d8b54 update delete_inventory task 2017-06-29 00:15:56 -04:00
Wayne Witzel III 0204fc1347 org on_delete to SET_NULL and migration 2017-06-29 00:15:41 -04:00
Wayne Witzel III e84ecabe72 add schedule_deletion method and signal 2017-06-29 00:15:11 -04:00
Wayne Witzel III d39dba9892 Merge pull request #6665 from ansible/fallback-test 
Reencrypt during data migrations
 2017-06-21 12:03:08 -04:00
Wayne Witzel III fe3e5a48c3 Reencrypt during data migrations 2017-06-21 11:54:36 -04:00
Wayne Witzel III 9a48f16bf2 Merge pull request #6645 from ansible/fallback-test 
Fix reencryption migrations.
 2017-06-20 13:03:36 -04:00
Wayne Witzel III 3750f2ebf3 copy NotificationTemplate code for migration and use Credential model directly 2017-06-20 10:39:07 -04:00
Wayne Witzel III bd52e4bb22 allow conf.settings to fallback to old encryption methods so settings work during migrations 2017-06-20 10:38:34 -04:00
Wayne Witzel III 7111d9232f Fix should_decrypt_field to work with non-str fields (return False) 2017-06-20 10:37:44 -04:00
Wayne Witzel III e1e416bc6d Update CHANGELOG, Fernet256 2017-06-16 16:38:14 -04:00
Wayne Witzel III 2b98f2b9c9 Merge pull request #6622 from wwitzel3/devel 
Implement Fernet256 using AES-256-CBC
 2017-06-16 16:31:17 -04:00
Wayne Witzel III 7f72d5c6d1 Implement Fernet256 using AES-256-CBC 2017-06-16 16:06:57 -04:00
Wayne Witzel III 41d9145403 Merge pull request #6601 from wwitzel3/devel 
Fix re-encryption migration for credentials.
 2017-06-15 13:13:40 -04:00
Wayne Witzel III f9b412419c update encryption migration checks and tests 2017-06-15 12:06:18 -04:00
Wayne Witzel III 9014e8c612 remove if AESCBC overhead 2017-06-15 11:25:29 -04:00
Wayne Witzel III c554c10c5c remove credential_type iteration, explicitly check for encyption with startswith 2017-06-15 11:25:29 -04:00
Wayne Witzel III 2c1a39233e monkey-patch get_current_apps so that resolve_role_field works correctly 2017-06-15 11:25:28 -04:00
Wayne Witzel III adc371fcf8 remove errant encryption migration call 
ensure credential migration was using the proper algorithm
 2017-06-15 11:25:28 -04:00
Wayne Witzel III 57bb097f57 Merge pull request #6599 from wwitzel3/issue-6592 
Ensure InventorySource access is checking against Inventory access
 2017-06-15 09:56:54 -04:00
Wayne Witzel III d8dfc7e97b Ensure InventorySource access is checking against Inventory access properly 2017-06-15 09:29:17 -04:00
Wayne Witzel III 8989c95b93 Add new encryption to CHANGELOG 2017-06-12 14:23:50 -04:00
Wayne Witzel III af7762e417 Fix typo and update tests to catch other typos 2017-06-12 14:14:46 -04:00
Wayne Witzel III d1008e4ccd Remove unused encryption method and update comment 2017-06-12 13:08:53 -04:00
Wayne Witzel III 861d6a659c Update conf.Settings migration 2017-06-12 13:00:01 -04:00
Wayne Witzel III 3ef7f13131 Explicitly continue if new encryption is already being used. 2017-06-12 12:54:11 -04:00
Wayne Witzel III 73fe8dd469 reencrypt start_args for UnifiedJobs 2017-06-12 09:54:12 -04:00
Wayne Witzel III 8d96d08510 Add Re-Encryption migrations, helpers, and tests 2017-06-12 09:54:12 -04:00
Wayne Witzel III b5d61c3c53 Relocate encryption helpers, update settings, tests, and imports 2017-06-12 09:54:12 -04:00
Wayne Witzel III 1d6d538ae7 Merge pull request #6506 from wwitzel3/devel 
Update `/update_inventory_sources` endpoint documentation
 2017-06-07 17:03:21 -04:00
Wayne Witzel III 9e0d0e566d Update /update_inventory_sources endpoint documentation 2017-06-07 16:42:52 -04:00
Wayne Witzel III 18bdc51276 Merge pull request #6490 from wwitzel3/devel 
Ensure the admin_role can always add an inventory_source.
 2017-06-07 12:16:58 -04:00
Wayne Witzel III c6925ca8b4 Ensure the admin_role can always add an inventory_source. 2017-06-07 11:44:44 -04:00
Wayne Witzel III 01471e02bb Merge pull request #6358 from wwitzel3/issue-6099 
Add smart_inventories endpoint to Host
 2017-05-26 14:24:01 -04:00
Wayne Witzel III d846e352ab minor doc typo 2017-05-26 10:19:47 -04:00
Wayne Witzel III e28cd97ffb Add smart_inventories endpoint to Host 2017-05-26 10:16:12 -04:00
Wayne Witzel III c5364f49bd add some info about field deprecation for InventorySource 2017-05-23 13:25:08 -04:00
Wayne Witzel III dc415f17b5 adding more details about host_filter 2017-05-23 13:16:03 -04:00
Wayne Witzel III 66af36e5c9 inventory refresh overview updates 2017-05-23 12:58:03 -04:00
Wayne Witzel III d1097678f9 Added initial Inventory Refresh doc 2017-05-23 12:26:08 -04:00
Wayne Witzel III 5d867d51f4 Merge pull request #6312 from wwitzel3/devel 
Use contains for `search` query in SmartFilter
 2017-05-22 14:14:17 -04:00
Wayne Witzel III 356a2bc057 Use contains for search query in SmartFilter 2017-05-22 13:48:42 -04:00
Wayne Witzel III 631f82b574 Merge pull request #6304 from wwitzel3/issue-6193 
Extend SmartFilter to expand search and related search fields
 2017-05-19 18:22:04 -04:00
Wayne Witzel III 530df327ca Call filter from BoolOperand and catch LookupError 2017-05-19 16:49:25 -04:00
Wayne Witzel III b99a118aae Revert back to more explicit ParseException 2017-05-19 16:15:44 -04:00
Wayne Witzel III bac1e8b4fe Extend SmartFilter to expand search and related search fields 2017-05-19 16:05:24 -04:00
Wayne Witzel III 3cf698d4ae Merge pull request #6301 from wwitzel3/v2-inv-kind 
add kind to Inventory summarizable fields
 2017-05-19 11:35:49 -04:00
Wayne Witzel III e4f4cc1372 add kind to Inventory summarizable fields 2017-05-19 10:59:50 -04:00
Wayne Witzel III 7c2e5df659 Merge pull request #6282 from wwitzel3/smart-inventory 
Dynamic -> Smart Inventory
 2017-05-17 16:36:51 -04:00
Wayne Witzel III d652ed16d0 Dynamic -> Smart Inventory 2017-05-17 16:25:40 -04:00
Wayne Witzel III 8b0735a910 Merge pull request #6240 from wwitzel3/issue-6233 
Add test to verify no duplicate results in DynamicFilter
 2017-05-15 12:31:25 -04:00
Wayne Witzel III 477956ec30 Add distinct to HostManager for DynamicFilter results 2017-05-15 12:20:17 -04:00
Wayne Witzel III b2b15043c9 Test that the DynamicFilter does not return duplicates. 2017-05-15 12:10:57 -04:00
Wayne Witzel III b9520c7f3b Merge pull request #6246 from wwitzel3/issue-5756 
Create /inventories/N/update_inventory_sources endpoint.
 2017-05-12 17:30:00 -04:00
Wayne Witzel III 54876e71e7 Added tests for post conditional logic 2017-05-11 15:31:39 -04:00
Wayne Witzel III aff084e1f6 Update permissions/RBAC for updates 2017-05-11 14:01:32 -04:00
Wayne Witzel III 0e816a2d98 Create /inventories/N/update_inventory_sources endpoint 2017-05-11 13:05:49 -04:00
Wayne Witzel III dfd65441b1 Merge pull request #6177 from wwitzel3/devel 
add organization_id to Inventory summary fields
 2017-05-03 17:13:20 -04:00