Commit Graph

5022 Commits

Author SHA1 Message Date
Wayne Witzel III
524343870b Added Project & Inventory signals for JobTemplate RBAC 2018-04-05 09:46:03 -04:00
Alan Rominger
ab277e816a Merge pull request #1242 from AlanCoding/copy_scripts
Remove shortcut for custom scripts copy
2018-04-05 08:45:15 -04:00
Alan Rominger
e5f93bdf95 Merge pull request #1245 from AlanCoding/orphaned_workflows
Fix WFJT user_capabilities special-case
2018-04-05 08:22:42 -04:00
AlanCoding
133cca1446 fix WFJT user_capabilities special-case 2018-04-05 08:04:18 -04:00
Ryan Petrello
5f01d26224 automatically encrypt/decrypt main_oauth2application.client_secret
see: https://github.com/ansible/awx/issues/1416
2018-04-04 15:35:24 -04:00
AlanCoding
6e1e7d8426 remove shortcut for custom scripts copy 2018-04-04 14:35:28 -04:00
Alan Rominger
c2446beb6e Merge pull request #1235 from AlanCoding/rm_TOWER_HOST
remove TOWER_HOST from job env vars
2018-04-04 10:42:16 -04:00
Christian Adams
2b7ad578d5 Merge pull request #1121 from rooftopcellist/organization_based_permission
Organization based permission
2018-04-04 10:39:40 -04:00
AlanCoding
c064195025 remove TOWER_HOST from job env vars 2018-04-04 10:32:41 -04:00
Alan Rominger
716a2a6b0f Merge pull request #1213 from AlanCoding/alan_does_jsonschema
custom message for JSONschema type error
2018-04-04 10:27:23 -04:00
adamscmRH
53139b109e clean up application logic 2018-04-04 10:22:49 -04:00
Ryan Petrello
808267d3fe Merge pull request #1234 from ryanpetrello/hey-hey-hey-goodbye
remove old crusty test fixtures
2018-04-04 09:48:09 -04:00
AlanCoding
996a5b20b0 unit tests of cred field types 2018-04-04 09:38:50 -04:00
Ryan Petrello
4b518298a6 remove old crusty test fixtures 2018-04-04 09:32:17 -04:00
Ryan Petrello
0db24a5c97 more gracefully account for undefined stdout
see: https://github.com/ansible/tower/issues/1215
related: https://github.com/ansible/tower/pull/1192#issuecomment-377982131
2018-04-04 08:29:57 -04:00
Wayne Witzel III
6c7a7dbbc0 Merge pull request #1151 from wwitzel3/release_3.3.0
Fix issue with adding new RBAC fields
2018-04-04 08:03:52 -04:00
Ryan Petrello
856312e7ea Merge pull request #1226 from ryanpetrello/fix-1224
add more custom credential type env blacklist items
2018-04-04 08:03:02 -04:00
Wayne Witzel III
bab2745392 Refresh the old instance so the returned obj is up-to-date 2018-04-04 07:49:29 -04:00
Wayne Witzel III
5f888d8400 Fix issue with adding new RBAC fields 2018-04-04 07:48:21 -04:00
Alan Rominger
bf4251794a Merge pull request #1223 from AlanCoding/delete_user_role
Delete user role on deletion of a user
2018-04-04 07:04:04 -04:00
Ryan Petrello
31a0eab880 add more custom credential type env blacklist items
see: https://github.com/ansible/tower/issues/1224
2018-04-03 15:44:44 -04:00
Alan Rominger
ac1bc08480 Merge pull request #1220 from AlanCoding/fix_check_related
fix bug where role name was given incorrectly
2018-04-03 15:12:23 -04:00
AlanCoding
ee8416140a custom message for JSONschema type error 2018-04-03 14:38:30 -04:00
AlanCoding
a52b22ffdf delete user role on deletion of a user 2018-04-03 14:31:56 -04:00
chris meyers
88fbb6706f use non-deprecated way of setting many2many 2018-04-03 14:31:37 -04:00
Chris Meyers
9677a9841c Merge pull request #1221 from chrismeyersfsu/fix-isolated_query
fixed isolated instance query
2018-04-03 14:04:01 -04:00
Alan Rominger
59c30af19f Merge pull request #1219 from AlanCoding/dragon_vault_id
Prevent unicode errors in cred unique_hash
2018-04-03 14:01:51 -04:00
chris meyers
c3100afd0e fixed isolated instance query
* Was considering an isolated instance: any instance that has at least 1
group with no controller. This is technically correct since an iso node
can not be a part of a non-iso group.
* The query is now more robust and considers a node an iso node if ALL
groups that a node belong to ALL have a controller.
* Also added better debugging for the special tower instance group
* Added a check for the existance of the special tower group so that
logs are less "messy" during the install process.
2018-04-03 13:50:57 -04:00
AlanCoding
8a7f00bdf7 fix bug where role name was given incorrectly 2018-04-03 13:39:16 -04:00
AlanCoding
9695031b27 prevent unicode errors in cred unique_hash 2018-04-03 13:34:21 -04:00
Ryan Petrello
8e51f61afa Merge pull request #1195 from ryanpetrello/dont_log_task_args
only record task.args in the callback plugin if `DISPLAY_ARGS_TO_STDOUT`
2018-04-03 12:44:53 -04:00
adamscmRH
9ef1fce5e1 add tests & correct auditor permissions 2018-04-03 11:03:50 -04:00
AlanCoding
482c159ac6 prohibit config callback with no inventory 2018-04-03 10:56:35 -04:00
Ryan Petrello
5fd5c95a1d only record task.args in the callback plugin if DISPLAY_ARGS_TO_STDOUT
see: https://github.com/ansible/awx/issues/1633
2018-04-03 10:52:55 -04:00
adamscmRH
e9a128138a add org-app endpoint & permissions 2018-04-03 08:58:53 -04:00
adamscmRH
a7625b8747 add organization to app model 2018-04-03 08:58:53 -04:00
AlanCoding
fe04f69e89 update tests for org members seeing teams 2018-04-03 07:50:49 -04:00
AlanCoding
d2ec880cad allow org members to see teams in org 2018-04-03 07:41:06 -04:00
Chris Meyers
654a1b3e09 Merge pull request #1201 from chrismeyersfsu/fix-provision_instance_list
append registered hostname to policy list
2018-04-02 16:39:20 -04:00
Chris Meyers
d2c9bd2f3b Merge pull request #1194 from chrismeyersfsu/fix-more_better_unicode_handling
better unicode handling
2018-04-02 16:31:21 -04:00
chris meyers
e5dcfda1fe append registered hostname to policy list
* The Instance Group list of instances was getting over-written with
every call to the register_instance management command.
* This changeset appends --hostnames to the Instance Group policy list.
2018-04-02 16:26:59 -04:00
Wayne Witzel III
c4635fa683 Merge pull request #1199 from wwitzel3/fix-1189
Fixes RBAC issue, ensures can admin of sub_obj when needed
2018-04-02 16:06:11 -04:00
Wayne Witzel III
067ead35ac Extend test and fix to include the admin_role 2018-04-02 15:39:01 -04:00
Wayne Witzel III
ea7a0b2f58 Fixes RBAC issue, ensures can admin of sub_obj when needed 2018-04-02 14:10:14 -04:00
AlanCoding
dd8acb70be add deletion protection to hosts 2018-04-02 13:21:22 -04:00
Alan Rominger
6a835b8a6b Merge pull request #1193 from AlanCoding/broken_no_launch
hide launch button for invalid JTs (using user_capabilities)
2018-04-02 13:08:53 -04:00
chris meyers
557637afcb better unicode handling 2018-04-02 12:05:16 -04:00
AlanCoding
d8f37e799b hide launch button for invalid JTs 2018-04-02 11:58:02 -04:00
chris meyers
7e7ff8137d more gracefully account for undefined stdout
* It's possible to have an exception raised in BaseTask.run() before the
stdout handler gets defined. This is problematic when the exception
handler tries to access that undefined var .. causing another exception.
Note that the second exception is caught also but it's not desirable to
lose the first exception.
* This fix checks to see if the stdout handler var is defined before
calling it's methods. Thus, we retain the original error message.
2018-04-02 11:41:30 -04:00
Chris Meyers
47fa99d3ad Merge pull request #1154 from chrismeyersfsu/enhancement-tower_in_all_groups
add all instances to special tower instance group
2018-04-02 09:39:04 -04:00