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
15,203 Commits 65 Branches 102 Tags
bba7f45972f92693ac0837f476011f0649c79b4d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Rominger 88e2741836 Merge pull request #1370 from AlanCoding/backport_with_items 
[3.2.4] with_items no_log fix
 2018-04-16 09:57:25 -04:00
AlanCoding 77aab65f57 fix no_log leaking with_items values 2018-04-13 15:41:57 -04:00
Alan Rominger 89f770c9ca Merge pull request #1270 from AlanCoding/user_editability 
User editing permission changes (3.2.4 backport)
 2018-04-06 14:19:50 -04:00
AlanCoding 1195385492 User editing permission changes 
Only allow administrative action for a user
who is a system admin or auditor if the
the requesting-user is a system admin.

Previously a user could be edited if the
requesting-user was an admin of ANY of the
orgs the user was member of.
This is changed to require admin permission
to ALL orgs the user is member of.

As a special-case, allow org admins to add
a user as a member to their organization if
the following conditions are met:
- the user is not member of any other orgs
- the org admin has permissions to all of
  the roles the user has
 2018-04-06 14:05:29 -04:00
AlanCoding f6e507ad12 add API setting for UI live updates 
include context data

update help text
 2018-03-23 12:40:31 -07:00
Alan Rominger 1a6819cdea Merge pull request #630 from AlanCoding/text_type 
Fix unicode bugs with log statements
 2018-02-15 15:52:29 -05:00
AlanCoding 465e605464 fix unicode bugs with log statements 2018-02-15 15:26:58 -05:00
Alan Rominger 5935c410e4 Merge pull request #629 from AlanCoding/export 
Use --export option for ansible-inventory
 2018-02-14 15:56:05 -05:00
AlanCoding b01deb393e use --export option for ansible-inventory 2018-02-14 14:48:13 -05:00
Alan Rominger 759867c863 Merge pull request #609 from AlanCoding/more_encryption_tests 
encryption tests around the contract with survey functionality
 2017-12-04 14:20:30 -05:00
Alan Rominger d4613d448c Merge pull request #608 from AlanCoding/empty_string_defaults 
allow password default reuse with empty default
 2017-12-04 14:19:32 -05:00
AlanCoding dbd68c5747 encryption tests around the contract with survey functionality 2017-12-04 11:45:07 -05:00
AlanCoding d23d7c422d allow password default reuse with empty default 2017-12-04 10:49:36 -05:00
Alan Rominger e0edfeac7c Merge pull request #602 from AlanCoding/clean_defaults 
block user from entering encrypted as bare default
 2017-12-01 14:54:42 -05:00
AlanCoding 47f45bf9b3 block user from entering encrypted as bare default 2017-12-01 14:44:06 -05:00
AlanCoding 6269b43456 update tests to new Ansible core code 2017-12-01 12:31:56 -05:00
AlanCoding 67867cf0c8 flake8: comply with new E722 rule 2017-12-01 12:16:44 -05:00
Alan Rominger 4ea27e0d1b Merge pull request #587 from AlanCoding/computed_self 
update original when updating computed fields
 2017-11-17 12:23:43 -05:00
AlanCoding 51c73cb357 update original when updating computed fields 2017-11-17 10:16:49 -05:00
AlanCoding fb29f68efc update smart inventory computed fields 2017-11-16 11:57:30 -05:00
Alan Rominger dbe135991b Merge pull request #575 from AlanCoding/single_cancel 
do not propogate cancel of inventory sync back up to project
 2017-11-15 09:46:41 -05:00
AlanCoding 33574d70c8 do not propogate cancel of inventory sync back up to project 2017-11-13 08:44:00 -05:00
Alan Rominger e22486ada8 Merge pull request #573 from AlanCoding/7765 
[3.2.2] fix bug of system auditor 404 viewing job
 2017-11-08 11:16:28 -05:00
AlanCoding 0051da95c9 fix bug of system auditor 404 viewing job 2017-11-08 10:44:41 -05:00
Alan Rominger 003d7f0915 Merge pull request #543 from AlanCoding/urlencode_host_filter 
[3.2.2] urlencode unquote host_filter on save
 2017-10-27 08:50:39 -04:00
Alan Rominger c323a2393a Merge pull request #552 from AlanCoding/retry_cleanup 
[3.2.2] retry cleanup of build artifacts for bwrap race condition
 2017-10-27 08:23:28 -04:00
AlanCoding 48ec69c4f5 retry cleanup of build artifacts for bwrap race condition 2017-10-26 13:33:21 -04:00
AlanCoding 018514d657 urlencode unquote host_filter on save 2017-10-24 08:05:08 -04:00
Alan Rominger 350699eda8 Merge pull request #504 from AlanCoding/fk_error_msg 
[3.2.2] tweak of error message for ForeignKey filters
 2017-10-18 19:06:12 -04:00
Alan Rominger f6bf0ad21f Merge pull request #521 from AlanCoding/update_isolated 
[3.2.2] update isolated container requirements
 2017-10-12 14:24:38 -04:00
Alan Rominger b2e63d5e47 Merge pull request #510 from AlanCoding/event_accounting 
add logger statement for number of events
 2017-10-10 22:12:11 -04:00
Alan Rominger e7ede6af4a Merge pull request #525 from AlanCoding/update_isolated_version 
[3.2.2] update fallback isolated version to 3.2.2
 2017-10-10 22:06:09 -04:00
Alan Rominger 5503d4efb4 Merge pull request #523 from AlanCoding/fix_isolated_capacity 
[3.2.2] fix equation for isolated instance capacity
 2017-10-10 22:04:03 -04:00
AlanCoding eab82f3efa updated fallback isolated version to 3.2.2 2017-10-10 15:45:20 -04:00
AlanCoding e66a1002ee fix equation for isolated instance capacity 2017-10-10 14:58:09 -04:00
AlanCoding e814f28039 add logger statement for number of events 2017-10-10 14:48:00 -04:00
AlanCoding 03e58523b2 tweak of error message for ForeignKey filters 2017-10-10 14:47:37 -04:00
AlanCoding 341ef411a4 update isolated container requirements 2017-10-10 14:46:41 -04:00
Alan Rominger 6f9fc0c3f8 Merge pull request #514 from AlanCoding/no_ordereddit 
[3.2.2] prevent OrderedDict syntax in error message
 2017-10-10 14:38:49 -04:00
AlanCoding 2fb67a3648 prevent OrderedDict syntax in error message 2017-10-10 14:38:49 -04:00
Alan Rominger 7b792926eb Merge pull request #509 from AlanCoding/max_ui_events 
[3.2.2] add CTiT setting for max UI job events
 2017-10-10 14:38:49 -04:00
AlanCoding dee4b72303 add CTiT setting for max UI job events 2017-10-10 14:38:49 -04:00
Alan Rominger 5994a77b84 Merge pull request #508 from AlanCoding/password_handholding 
[3.2.2] reword error message about encrypted user input
 2017-10-10 14:38:48 -04:00
Alan Rominger 7c86e38b81 Merge pull request #506 from AlanCoding/active_job_period 
[3.2.2] add period to active job conflict error
 2017-10-10 14:38:48 -04:00
AlanCoding 1c374fba7d reword error message about encrypted user input 2017-10-10 14:38:48 -04:00
Alan Rominger 335dfd564a Merge pull request #505 from AlanCoding/v1_jt_vc_ct_sf 
[3.2.2] Exclude credential type content from v1
 2017-10-10 14:38:48 -04:00
AlanCoding 5380d57ce8 add period to active job conflict error 
Rename StateConflict to ActiveJobConflict and used shared
message inside of that exception class.
 2017-10-10 14:38:48 -04:00
AlanCoding a01f80db5b Exclude credential type content from v1 
credential_type_id was showing up in vault_credential
summary_fields in API v1
 2017-10-10 14:38:48 -04:00
Alan Rominger 5fffdec69d Merge pull request #490 from AlanCoding/many_deleter_320 
[3.2.2] Delete all hosts or groups from inventory source
 2017-10-10 14:38:47 -04:00
AlanCoding d2e0b26287 allow deleting hosts and groups from inv src sublists 2017-10-10 14:38:47 -04:00
Alan Rominger 4f4af058b3 Merge pull request #480 from AlanCoding/committed_cap 
[3.2.2] add IG committed capacity to serializer
 2017-10-10 14:38:46 -04:00
Alan Rominger 3df8e2beb1 Merge pull request #494 from AlanCoding/wfjt_perm_fix2 
[3.2.2] fix bug checking WFJT node for prompted resources
 2017-10-10 14:38:46 -04:00
AlanCoding c45fbcf2ee add IG committed capacity to serializer 2017-10-10 14:38:46 -04:00
AlanCoding 3abbe87e10 fix bug checking WFJT node for prompted resources 2017-10-10 14:38:46 -04:00
Alan Rominger 4ea92f0dcb Merge pull request #306 from AlanCoding/new_perf_logging 
[3.2.2] new method of performance logging
 2017-10-10 14:38:45 -04:00
AlanCoding 9ee18d02c8 new method of performance logging 2017-10-10 14:38:45 -04:00
Alan Rominger 70f8ec78de Merge pull request #517 from AlanCoding/vars_exception 
fallback to empty dict when processing extra_data
 2017-10-10 09:30:06 -04:00
AlanCoding e2c398ade2 fallback to empty dict when processing extra_data 2017-10-10 08:13:45 -04:00
Alan Rominger 7365e4a63f Merge pull request #516 from AlanCoding/abc_migrations 
Fix 3.1.1->3.2.1 migration error
 2017-10-09 16:37:35 -04:00
AlanCoding d4fc4bcd61 fix migration problem from 3.1.1 2017-10-09 15:49:38 -04:00
AlanCoding 4237b9ed5c move 0005a migration to 0005b 2017-10-09 15:48:52 -04:00
Alan Rominger 2dd2541550 Merge pull request #507 from AlanCoding/adhoc_word_smithing 
[3.2.2] feedback on ad hoc prohibited vars error msg
 2017-10-06 14:15:16 -04:00
AlanCoding edda5e5420 feedback on ad hoc prohibited vars error msg 2017-10-06 14:07:38 -04:00
Alan Rominger e8b79cde4a Merge pull request #499 from AlanCoding/adhoc_local 
[3.2.1] Disallow Ansible vars in adhoc launch serializer + wayne's change
 2017-10-05 15:30:06 -04:00
AlanCoding 81c14ce942 fix WARNING log when launching ad hoc command 2017-10-05 13:42:23 -04:00
AlanCoding eacbeef660 Validate against ansible variables on ad hoc launch 
Share code between this check for ad hoc and JT callback
 2017-10-05 12:14:05 -04:00
Alan Rominger 2ec675cf54 Merge pull request #465 from AlanCoding/retry_retry 
broaden inventory deletion retry condition
 2017-09-26 14:48:13 -04:00
AlanCoding bfccd49a64 broaden inventory deletion retry condition 2017-09-26 10:45:30 -04:00
Alan Rominger 4c0fd573c6 Merge pull request #459 from AlanCoding/special_treatment 
always ignore deprecated_group if in groups
 2017-09-25 13:35:55 -04:00
Alan Rominger 5bec43fc8e Merge pull request #462 from AlanCoding/bad_groups 
handle additional cases of inv script output
 2017-09-25 13:31:16 -04:00
AlanCoding 647d272a31 handle additional cases of inv script output 2017-09-25 12:20:21 -04:00
AlanCoding a4a17fe14c always ignore deprecated_group if in groups 
If overwrite=True for an inventory source import, then this matters
creating a new inventory source through v1 API will not include
deprecated_group inside of the InventorySource groups m2m related
connection, but migrations from 3.1 will

In those migrated cases, this code will leave the deprecated_group
untouched, so as to not trigger its cascade delete
 2017-09-25 11:22:12 -04:00
Alan Rominger 186d61aac4 Merge pull request #448 from AlanCoding/more_task_mgr_fixing 
fix task manager running task structures
 2017-09-21 16:27:32 -04:00
AlanCoding dba83674a2 fix task manager running task structures 
- prevent dual-entry for first item in running jobs due to
   setdefault syntax
 - fix issue where queues (celery tasks) only returned the last
   item in the inspector output due to looping problem
   this caused reaper bugs in production
 2017-09-21 14:38:58 -04:00
Alan Rominger 428eca1c35 Merge pull request #439 from AlanCoding/custom_hostvars 
add back logic to re-call script for hostvars
 2017-09-20 15:43:52 -04:00
AlanCoding 80a944dd31 add back logic to recall script for hostvars 2017-09-20 13:20:04 -04:00
Alan Rominger 9db91b4344 Merge pull request #436 from AlanCoding/set_node_early 
set execution_node right when jobs are accepted
 2017-09-20 12:43:51 -04:00
AlanCoding 892ca98709 set execution_node right when jobs are accepted 2017-09-20 11:49:09 -04:00
Alan Rominger 88ffb32d4f Merge pull request #427 from AlanCoding/inv_for_the_people 
Inventory file suggestion adjustments from user feedback
 2017-09-19 10:36:02 -04:00
AlanCoding 120b5297e3 Inventory file suggestion adjustments from user feedback 
- ditch yaml files as suggestions
 - automatically greenlight any hosts or inventory titled file
 2017-09-18 14:28:29 -04:00
Alan Rominger 7c920c305f Merge pull request #397 from AlanCoding/7583 
add help for instance provisioning
 2017-09-09 15:17:37 -07:00
AlanCoding 42ee804464 add help for instance provisioning 2017-09-08 14:36:17 -07:00
Alan Rominger 19ebd0aa68 Merge pull request #382 from AlanCoding/isolated_reaper 
reap isolated jobs
 2017-09-08 12:41:03 -07:00
AlanCoding 8e1e60c187 simplify isolated job reaping by checking all task ids 2017-09-08 12:30:05 -07:00
AlanCoding 878e7ef49f reap isolated jobs 2017-09-08 10:40:39 -07:00
Alan Rominger 757a91a7d2 Merge pull request #385 from AlanCoding/smart_validation 
fuller validation for host_filter
 2017-09-05 10:39:33 -04:00
AlanCoding a36a141141 fuller validation for host_filter 2017-08-31 23:10:09 -04:00
Alan Rominger 12537c2739 Merge pull request #376 from AlanCoding/host_filter_goof 
fix bug with host_filter RBAC check
 2017-08-31 12:09:00 -04:00
Alan Rominger 3530b643b6 Merge pull request #374 from AlanCoding/v1_adhoc 
remove can_run_ad_hoc_commands in v2
 2017-08-31 11:33:18 -04:00
AlanCoding 2027047220 fix bug with host_filter RBAC check 2017-08-31 10:42:16 -04:00
AlanCoding ceafa3803a remove can_run_ad_hoc_commands in v2 2017-08-30 23:14:05 -04:00
Alan Rominger de3b9fc70d Merge pull request #364 from AlanCoding/null_inv_val 
more coherent source_script & inv validation
 2017-08-30 10:35:04 -04:00
Alan Rominger 2385c28046 Merge pull request #366 from AlanCoding/logger_unicode 
smart_str in log statement to avoid unicode error
 2017-08-30 10:33:43 -04:00
AlanCoding 78ab13a44e smart_str in log statement to avoid unicode error 2017-08-30 09:47:18 -04:00
AlanCoding 20e82eba42 more coherent source_script & inv validation 2017-08-30 08:31:08 -04:00
Alan Rominger 7a1f674abc Merge pull request #363 from AlanCoding/org_smart_inv 
backend of org-scoped smart inventories
 2017-08-29 20:51:03 -04:00
Alan Rominger e679997ecc Merge pull request #359 from AlanCoding/fail_ans_inv 
set flag to fail imports on errors
 2017-08-29 16:51:48 -04:00
AlanCoding ff96a750e1 backend of org-scoped smart inventories 2017-08-29 16:43:56 -04:00
AlanCoding 9d91875832 set flag to fail imports on errors 2017-08-29 14:36:53 -04:00
Alan Rominger ba8326285e Merge pull request #337 from AlanCoding/capacity_fix 
correct capacity algorithm for task manager
 2017-08-28 16:49:19 -04:00