External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 00:40:11 -02:30
Code Issues Packages Projects Releases Wiki Activity
4,997 Commits 63 Branches 102 Tags
1e95ac1c54ec3ae8f8f32dd7c55753fd6dfc446a
Commit Graph
1293 Commits
Author SHA1 Message Date
Matthew Jones 1e95ac1c54 Merge pull request #361 from cchurch/recursive_inventory 
Fix inventory issues when a group is its own parent
 2015-08-06 21:30:45 -04:00
Chris Church 3560e5a2eb Limit max depth when building mapping of group depths to avoid hitting recursion limit. Fixes https://trello.com/c/2zc0odvX 2015-08-06 14:59:04 -04:00
Matthew Jones f20d93a274 Merge pull request #358 from cchurch/openssh_private_key_support 
Support private keys in OpenSSH format
 2015-08-05 19:44:56 -04:00
Matthew Jones 64c3b1ec69 Merge pull request #345 from chrismeyersfsu/fix-centos_6.5 
unittest works on centos 6.5
 2015-08-05 19:43:57 -04:00
Matthew Jones ab042c269b Set recursive on child process canceling 
Sometimes ansible spawns many subprocesses that can get orphaned and
stuck if we only kill the direct descendent child processes
 2015-08-05 11:44:50 -04:00
Matthew Jones efcff9b5f7 Fix psutil usage on el6 for job cancel 
psutil will fail to import on el6 due to not being able to access a
pseudo terminal.  This issues a SIGKILL to the proot process in order to
force the stop
 2015-08-05 11:20:48 -04:00
Matthew Jones 14df41b47b mock stdout unit test patch failure fix 
Adjust some mock.patch behavior to match the new stdout behavior where
we need to check a file's size as well as its existence
 2015-08-05 10:02:07 -04:00
Chris Church b647811456 Add support for detecting encrypted openssh format private keys. Fixes https://trello.com/c/ZeVOXN5U 2015-08-04 18:59:25 -04:00
Matthew Jones 7e45ee8b55 Fix empty standard out behavior 
Previously we could just check for the absence of the stdout file to
know we didn't yet/wouldn't ever have any stdout content.  Now that we
are creating the stdout file ahead of time and persisting it we need to
also check to see if the file contains any data.   This is also
necessary for some unit tests.
 2015-08-04 14:25:05 -04:00
Matthew Jones bddcb06fab Merge branch 'stdout_file_download' into upstream_master 
* stdout_file_download:
  Rework stdout display for file storage only
 2015-08-03 15:30:17 -04:00
Matthew Jones 1c777c5441 Rework stdout display for file storage only 
* Cleanup old code related to stdout download using temporary files
* Remove copy-into-database code
* Modify stdout download code to reference stdout file
 2015-08-03 15:14:51 -04:00
Matthew Jones 2f05ac7276 Merge pull request #349 from matburt/master 
Optimize inventory read check for Job Templates
 2015-08-03 09:57:51 -04:00
Chris Meyers e98ee0b428 Merge pull request #330 from chrismeyersfsu/fix-update_instance 
change update_instance to only take --primary role flag
 2015-07-31 15:39:42 -04:00
Chris Meyers 3bc2a38dfe Merge pull request #323 from chrismeyersfsu/fix-job_survey_vars 
on job template launch inherit variables in the following hierarchy
 2015-07-31 15:37:17 -04:00
Matthew Jones 47a3e69636 Optimize inventory read check for Job Templates 
Our old check used an extremely inefficient boolean logic AND and
generated a bad query.   This does a simpler check by querying the
inventories that the user has access to and using that as a simple
condition when performing the job template permission query
 2015-07-31 00:06:12 -04:00
Chris Meyers f64a48a98f python 2.6 safe total_seconds 2015-07-30 13:40:31 -04:00
Chris Meyers b0f55c832d invoke redis in a way that works on centos and ubuntu 2015-07-30 08:37:21 -04:00
Chris Meyers 456f460ed9 add path needed for unittest to find redis on centos 6.5 2015-07-29 16:16:00 -04:00
Chris Meyers 34ecd4e5b6 use python2.6 safe unittest2 2015-07-29 15:07:40 -04:00
Chris Meyers 0ce3a240e6 on job template launch inherit variables in the following hierarchy 
(bottom up):

* Job Launch Extra Vars
* Job Template Survey (defaults)
* Job Template Extra vars
 2015-07-28 09:21:43 -04:00
Matthew Jones 28759e9f20 Use psutil to find the right job to TERM 
* When using proot use psutil to find the ansible child process and
  issue the SIGTERM to instead of the proot process
 2015-07-24 12:06:02 -04:00
Chris Meyers 8a453d51b2 change update_instance to only take --primary role flag 
* removed --secondary option
 2015-07-24 08:46:34 -04:00
Matthew Jones 7937b4fbbd Implement a stdout tmp cleanup task 
* Cleans up stdout tempfiles generated for download
* Runs every 3 hours, cleans up files older than 1 day
 2015-07-22 15:24:52 -04:00
Matthew Jones b1b49ba286 Efficient stdout downloader implementation 
* Temporarily dump stdout contents to a configurable temp location
* Implement file streaming to the host via a new format specifier in the
  api view
 2015-07-22 15:08:37 -04:00
Matthew Jones 55da712a95 Protect against very large stdout fields 
* Defer loading result_stdout_text until specifically needed
* Conditionally display it based on the size of the field
* Provide a helpful message otherwise
 2015-07-22 14:13:48 -04:00
Chris Meyers 2dc22042ee flake8 fixes 2015-07-20 11:21:03 -04:00
Chris Meyers fd3422437d Merge pull request #311 from chrismeyersfsu/fix-workload_generator4 
use file fact scan data for file fact scan module scans
 2015-07-17 10:24:52 -04:00
Chris Meyers 3a07c85898 use file fact scan data for file fact scan module scans 2015-07-13 15:27:23 -04:00
Matthew Jones 874c97f748 Purge some unneeded HA unit tests 2015-07-08 14:31:02 -04:00
Matthew Jones 5605ec9754 Adjust usage of is_ha_environment() 
Limit it to just instance count and make sure we use it for the mongo check
 2015-07-08 14:18:04 -04:00
Matthew Jones 9e6c604fc1 Remove extra output from doing a hard mongo shutdown. 2015-07-06 14:38:19 -04:00
Matthew Jones 4fd0fbda08 Invert the conditional checking for whether or not mongo is running 2015-07-06 14:28:27 -04:00
Matthew Jones 26af43dab6 Remove superflous sleep when shutting mongo down 2015-07-06 14:19:12 -04:00
Matthew Jones 9b03d22d75 Fixes to conditionally invoking mongo shutdown 
* Make sure we are waiting on the service script
* Improve sudo configuration
* Check pidof before attempting to invoke a hard mongo shutdown
 2015-07-06 14:15:41 -04:00
Matthew Jones 10f5308bd8 Fix version parsing of ansible to exclude newlines 2015-07-06 12:16:17 -04:00
Matthew Jones 5a77d1f0d4 Fix up mongo service handline and task logging 
* Use -f instead of -c for mongod when refernecing config file
  for shutdown behavior in the stop task
* Fix up task logging to use new supervisor configuration syntax
 2015-07-06 11:49:24 -04:00
Chris Meyers 8f804cf9fa python 2.6 compatible total_seconds 2015-06-29 16:55:56 -04:00
Matthew Jones 414394afa0 can not -> cannot (even though they are both correct) 2015-06-26 15:35:33 -04:00
Matthew Jones 05f56c805a Logic should check for the condition where HA is NOT enabled 2015-06-26 15:28:41 -04:00
Matthew Jones 80a6f22c0c Move HA license check logic to the promotion step and allow registering 
HA instances.   Registration is allowed but promotion/demotion is not
allowed without the HA feature
 2015-06-26 15:23:07 -04:00
Matthew Jones 237a661912 Fix verbage around why we are disallowing removing a primary 2015-06-26 15:22:35 -04:00
Chris Meyers 8095f88e38 Merge pull request #295 from chrismeyersfsu/feature-fact_cache_receiver_verbose_logging 
added more logging for fact cache receiver
 2015-06-24 16:32:02 -04:00
Chris Meyers 713f18438c added more logging for fact cache receiver 2015-06-24 14:07:18 -04:00
Chris Meyers 5eb4f51be9 Merge pull request #294 from chrismeyersfsu/feature-IPy 
robust check for HA env setup
 2015-06-24 09:21:26 -04:00
Matthew Jones b45ea4f1f4 Force shutdown of mongo after requesting a service stop. Just in case. 2015-06-23 12:32:43 -04:00
Chris Meyers 4669c44af9 robust check for HA environment setup 2015-06-23 11:21:00 -04:00
Chris Meyers 41de9c9f9f flake8 2015-06-23 07:58:01 -04:00
Chris Meyers bd61261454 when aging, use a more compact age to stay within username 30 char restriction 2015-06-22 13:06:50 -04:00
James Laska 6d6d9de379 Use the proper attr when saving instance name 
Fixes: https://trello.com/c/24OoIyyf
 2015-06-20 13:47:09 -04:00
Chris Meyers 39e508373f Merge pull request #288 from chrismeyersfsu/fix-workload_generator 
works with scan -> inventory link
 2015-06-19 09:26:04 -04:00