Commit Graph

3826 Commits

Author SHA1 Message Date
Ryan Petrello
1c066d478b substitute "$encrypted$" for actual password on logging config test
see: #6780
2017-07-03 12:14:43 -04:00
Ryan Petrello
de84f3cf4a fix a bug in cluster node version comparison 2017-06-30 11:28:04 -04:00
Ryan Petrello
57eb632e51 Merge pull request #6819 from ryanpetrello/fix-6810
isolated nodes should report their awx version in their heartbeat
2017-06-30 09:59:07 -04:00
Chris Meyers
668bce8212 fix job launch deadlock
* This both fixes the deadlock problem and a logic problem. We shouldn't
set the job's job_template current_job to pending jobs.
2017-06-30 09:54:08 -04:00
Ryan Petrello
413e8c3bc9 isolated nodes should report their awx version in their heartbeat
see: #6810
2017-06-29 16:55:11 -04:00
AlanCoding
ad4a7fe033 access_registry made simple dict with auto registration 2017-06-29 15:17:37 -04:00
Aaron Tan
a184058aa2 Merge pull request #6642 from jangsutsr/6593_enforce_mutual_exclusiveness_of_tower_user_origins
Expand scope of enterprise user types
2017-06-29 12:15:07 -04:00
Aaron Tan
d9d5fb38b8 Merge pull request #6732 from jangsutsr/6719_aggregate_service_restart_attempts
Aggregate Tower service restart attempts
2017-06-29 12:13:01 -04:00
Alan Rominger
68103f2d72 Merge pull request #6720 from AlanCoding/scm_inv_update_resp
Accuracy edit for inventory update response when updating project
2017-06-29 11:45:50 -04:00
Ryan Petrello
d27ca7de40 Merge pull request #6794 from ryanpetrello/fix-6748
more isolated production tinkering
2017-06-29 09:45:45 -04:00
Ryan Petrello
405c01a847 more isolated production tinkering
see: #5903
see: #6507
2017-06-29 09:35:26 -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
Aaron Tan
92f5025817 Aggregate Tower service restart attempts. 2017-06-28 16:49:36 -04:00
Aaron Tan
8140fc2fb2 Merge pull request #6781 from jangsutsr/6084_revert_adding_custom_paginator
Revert adding custom paginator
2017-06-28 16:30:05 -04:00
Alan Rominger
607680a22b Merge pull request #6775 from AlanCoding/testing_fix
Get logging test endpoint to work again
2017-06-28 16:02:53 -04:00
Aaron Tan
c40614b8a4 Revert adding custom paginator. 2017-06-28 15:49:55 -04:00
Ryan Petrello
7e06acd206 Merge pull request #6778 from ryanpetrello/fix-6748
minor tinkering to isolated key generation
2017-06-28 15:37:38 -04:00
Ryan Petrello
a4b00cf485 minor tinkering to isolated key generation 2017-06-28 15:32:31 -04:00
AlanCoding
c1ff41fa45 get logging test endpoint to work again
The handler and formatter classes are expecting an object
and the previous method passed a dict, so this change converts
the data into a mock settings object.
2017-06-28 15:10:18 -04:00
Alan Rominger
7d283f1dfd Merge pull request #6764 from AlanCoding/management_json_bug
Fix bug where isolated management jobs could not load JSON output
2017-06-28 11:52:22 -04:00
AlanCoding
05bcd4b674 fix bug where isolated management jobs could not load JSON output 2017-06-28 11:41:30 -04:00
Ryan Petrello
bd3bfbe1d1 Merge pull request #6640 from ryanpetrello/remove_use_venv
remove ANSIBLE_USE_VENV and TOWER_USE_VENV
2017-06-28 10:22:09 -04:00
Ryan Petrello
b0e51b42d8 fix a bug that prevents unpriveleged users from listing CredentialTypes
see: #6737
2017-06-27 16:47:02 -04:00
Ryan Petrello
0d0fb297b3 Merge pull request #6751 from ryanpetrello/devel
fix a bug in AES -> fernet encryption migration
2017-06-27 15:28:17 -04:00
Ryan Petrello
65ace1f446 fix a bug in AES -> fernet encryption migration
see: #6747
2017-06-27 15:07:44 -04:00
Ryan Petrello
aaff005234 Merge pull request #6745 from ryanpetrello/fix-6659
RFC: install a randomized RSA key for controller -> isolated rampart auth
2017-06-27 11:52:36 -04:00
Ryan Petrello
3000f52a92 install a randomized RSA key for controller -> isolated rampart auth
see: #6507
2017-06-27 10:53:44 -04:00
Ryan Petrello
2d9df199c6 Merge pull request #6736 from ryanpetrello/fix-6659
make isolated rampart settings API-configurable
2017-06-26 16:55:10 -04:00
Ryan Petrello
bfb7ad15ae make isolated rampart settings API-configurable
see: #6659
2017-06-26 15:47:14 -04:00
Ryan Petrello
28a1e1df53 Merge pull request #6725 from ryanpetrello/fix-isolated-heartbeat
properly update the heartbeat timestamp for isolated nodes
2017-06-26 12:00:28 -04:00
Alan Rominger
7699e26336 Merge pull request #6722 from AlanCoding/atomic_inv_del
use atomic transaction to delete inventory in task
2017-06-26 11:07:21 -04:00
Ryan Petrello
5adc1c603a properly update the heartbeat timestamp for isolated nodes 2017-06-26 11:03:56 -04:00
AlanCoding
cf751568b5 use atomic transaction to delete inventory in task 2017-06-26 10:46:58 -04:00
AlanCoding
4298d60679 fix bug in response of inventory update with update_on_project_update 2017-06-26 09:48:01 -04:00
Aaron Tan
f1869a2f70 Merge pull request #6220 from jangsutsr/6188_enable_ctint_category_specific_validation
Enable Tower configuration category-specific validation
2017-06-26 09:45:12 -04:00
AlanCoding
066dc4a5f0 Separate Inventory Source API vs RBAC testing
Introduced new decorator for patching an access method,
does legwork of inserting into access registry so that
tests that test the API can mock RBAC behavior.
2017-06-23 15:31:59 -04:00
Aaron Tan
68ee601359 Merge pull request #6595 from jangsutsr/6234_set_priority_rules_for_find_matching_hosts
Set priority rules for find_matching_hosts
2017-06-23 14:04:18 -04:00
Alan Rominger
30ec070357 Merge pull request #6692 from AlanCoding/manual_locations
Tag jobs started via special cases with node & group
2017-06-22 16:42:17 -04:00
AlanCoding
9e07b3f777 Tag jobs started via special cases with node & group 2017-06-22 16:24:12 -04:00
Ryan Petrello
97562fc4df block job template launches when an inventory is being deleted
see: #4382
2017-06-22 15:33:55 -04:00
Ryan Petrello
14addae813 delete inventories in the background via a celery task
see: #4382
see: #6279
2017-06-22 14:32:33 -04:00
Alan Rominger
8f254dbd82 Merge pull request #6675 from AlanCoding/controller_id_sf
add isolated job controller_id to summary fields
2017-06-22 10:44:53 -04:00
Alan Rominger
20f0a83bec Merge pull request #6682 from AlanCoding/isolated_execution
Have execution_node reflect isolated instance
2017-06-22 10:12:21 -04:00
Chris Meyers
fee16fe391 Merge pull request #6588 from chrismeyersfsu/feature-fact_cache
initial tower fact cache implementation
2017-06-22 09:58:28 -04:00
Chris Meyers
d6082a976b retain support for insights system_id discovery 2017-06-22 09:49:45 -04:00
Ryan Petrello
45bdd9f747 improve readability of the honcho console logs in the dev environment
* colorize uwsgi and celery logs; DEBUG lines are green, WARN lines
  are yellow, ERROR lines (and tracebacks) are red
* pretty-print fact callback receiver JSON
* simplify the uwsgi log format so it's more legible
2017-06-22 09:19:32 -04:00