1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Commit Graph

5001 Commits

Author SHA1 Message Date
Chris Meyers
fca62d1596 correctly inherit extra_vars
* inherit extra_vars from job_template
* overwrite with extra vars survey default vars
* overwrite with job extra_vars
2015-08-07 16:01:41 -04:00
Chris Meyers
7c315ebd33 allow unicode in stdout. 2015-08-07 13:46:39 -04:00
Chris Meyers
b907a49dc1 jenkins needs unittest2 also 2015-08-07 09:39:40 -04:00
Chris Meyers
d6098b15cb unittest2 needed to run unit tests 2015-08-07 09:39:08 -04:00
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
0633d4c672 Don't create a group that is its own parent when an EC2 tag has an empty value. Fixes https://trello.com/c/2zc0odvX 2015-08-06 15:03:54 -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
jlmitch5
8c9059b1dc Merge pull request #355 from jlmitch5/jlm_727_add_dl_stdout
Jlm 727 add dl stdout
2015-08-06 14:56:40 -04:00
Joe Fiorini
b5d6d8cb09 Update nodejs install in dev docker image 2015-08-06 14:34:47 -04:00
John Mitchell
224798351e don't display download button unless job is completed 2015-08-06 14:06:48 -04:00
Chris Meyers
0fb5e09ed4 successfully install requirements on python 2.6
jsonschema conditionally pulls in functools32 if python2.7 else it uses
2.6 packages.
2015-08-06 13:55:22 -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
a7ae1d8348 Merge pull request #359 from chrismeyersfsu/requirements.txt3
all vendor dependencies expressed in requirements.txt
2015-08-05 19:44:16 -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
91bd96f458 Merge pull request #360 from matburt/fix_el6_job_cancel
Fix overall job cancel behavior
2015-08-05 19:39:11 -04:00
Jared Tabor
f5e7b6ab6b Fix issue with lookup "Select" button 2015-08-05 13:14:58 -07: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 Meyers
fa1643e330 all vendor dependencies expressed in requirements.txt 2015-08-05 08:10:16 -04:00
Chris Church
4a1b5070b5 Merge pull request #357 from cchurch/make_honcho
Add support for honcho as alternative to tmux
2015-08-04 19:06:17 -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
Chris Church
71c2fd7f8d Add support for honcho as alternative to tmux for running development servers. 2015-08-04 15:26:27 -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
James Laska
3a61896cb5 Merge pull request #356 from wenottingham/404branch
Fix .ini web links for v2
2015-08-04 13:51:59 -04:00
Bill Nottingham
5aa399886b Fix .ini web links for v2
This moved in the github repo.
2015-08-04 13:46:30 -04:00
John Mitchell
66d71d6d1c moved standard out less block to be more modular 2015-08-04 12:01:09 -04:00
John Mitchell
659fe78285 fixed downloadable standard out for ad hoc commands 2015-08-04 11:55:09 -04:00
John Mitchell
b51f8beefb no standard out download for system jobs 2015-08-04 11:49:40 -04:00
John Mitchell
071b699ca8 UI implementation of downloadable standard out 2015-08-04 11:40:00 -04:00
Matthew Jones
c231601b76 Fix merge issues on stdout branch
The act of committing a PR that including part of these changes and then
reverting it meant that some of the changes from the original branch
didn't land in this new PR.   This commit adds the missing bits.

Lesson learned:  Create a new branch when submitting a PR on a
previously reverted PR
2015-08-04 09:57:39 -04:00
Joe Fiorini
e862e5ca7e More checkbox fixes 2015-08-04 09:41:13 -04:00
Joe Fiorini
30d8b29d90 ignore testem.yml in root 2015-08-03 15:34:08 -04:00
Joe Fiorini
b643dae4d5 Move testem.yml to packaging 2015-08-03 15:33:21 -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
Joe Fiorini
501612341c Accept mocha flags in node-tests task 2015-07-31 15:55:48 -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
Chris Meyers
397158e847 Merge pull request #328 from chrismeyersfsu/fix-ansi
fixes stdout formats unicode problem
2015-07-31 14:51:55 -04:00
Joe Fiorini
8e8ec52d15 Fix issues with forms using trueValue and falseValue 2015-07-31 12:00:52 -04:00
Sandra Wills
5f49ae0042 Merge pull request #350 from ansible/sam-doc-tower-master-branch
adding tower docs listings README.md
2015-07-31 10:51:42 -04:00
Joe Fiorini
fd3713f9a3 Merge pull request #346 from joefiorini/npm-shrinkwrap
Use npm shrinkwrap to control versions
2015-07-31 09:35:41 -04:00
Sandra Wills
e81c2e8939 added link to main tower docs
under the resoures section, added a simple link to the main
tower docs landing page with supporting text
2015-07-31 09:32:58 -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
Joe Fiorini
adbc8dfb08 Merge pull request #331 from joefiorini/post-2.2--angularUpgrade
Upgrade to angular 1.4
2015-07-30 13:05:55 -04:00
Joe Fiorini
8ce7914cb4 Fix button ordering 2015-07-30 13:05:27 -04:00
Joe Fiorini
c2d1e3865f Fix checkbox value assignment 2015-07-30 13:05:27 -04:00