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

5026 Commits

Author SHA1 Message Date
Joe Fiorini
524d0da0de Pass question directly for survey taker 2015-08-12 14:02:23 -04:00
Joe Fiorini
dd143c1c71 Use select lists for multiple choice answers 2015-08-12 14:02:23 -04:00
Joe Fiorini
e8c0e68789 Update to latest select2 2015-08-12 14:02:23 -04:00
Joe Fiorini
3b5d75133b Move all survey code to job-templates module 2015-08-12 14:02:22 -04:00
James Laska
94c2906810 Merge pull request #372 from jlaska/makefile_requirements_adjustments
Simplify Makefile requirements targets
2015-08-12 13:34:25 -04:00
jaredevantabor
fb1b0178d6 Merge pull request #373 from jaredevantabor/ngdocs-changes
updating ngdocs site file paths in grunt
2015-08-12 10:21:52 -07:00
James Laska
719c2cd477 Remove stale comment in Makefile 2015-08-12 09:34:28 -04:00
James Laska
a1cbdebdd3 Simplify Makefile requirements targets 2015-08-12 08:35:42 -04:00
Matthew Jones
4968848958 Merge pull request #371 from cchurch/openssh_key_check
Add error message when OpenSSH private keys aren't supported
2015-08-11 16:53:08 -04:00
Chris Church
2cd8e00bcf Add an error message when running a job and trying to use an OpenSSH formatted key on an older version of OpenSSH. 2015-08-11 16:30:27 -04:00
James Laska
6d4c6e2303 Make flake8 happy 2015-08-11 11:08:26 -04:00
James Laska
f325b02c66 Fix import error by calling prepare_env first 2015-08-11 10:47:45 -04:00
Matthew Jones
9aa89e08d9 Handle Ubuntu 12.04 psutil recursive cancel
Ubuntu has a crazy old version of psutil, we'll fall back to sigkill for
that platform
2015-08-11 10:24:54 -04:00
Chris Church
6c409404ba Incorporate OpenStack inventory changes from https://github.com/ansible/ansible/pull/11447 back into Tower. 2015-08-10 15:49:25 -04:00
Chris Meyers
4480c05d4e Merge branch 'chrismeyersfsu-job-relaunch2' 2015-08-10 15:43:28 -04:00
Chris Meyers
a19dede360 Merge branch 'job-relaunch2' of github.com:chrismeyersfsu/ansible-tower into chrismeyersfsu-job-relaunch2 2015-08-10 15:43:15 -04:00
John Mitchell
ee41ec78ab fixed alignment of download standard out button in modals 2015-08-10 15:21:37 -04:00
Matthew Jones
43d873acab Fix path check in start_development docker script 2015-08-10 14:36:39 -04:00
Jared Tabor
6ab4bc6800 About Tower version number fix
for parsing versions such as "2.3.0" and "2.3.0-0.git201507231538"
2015-08-10 08:41:49 -07:00
Chris Meyers
5f4f7e0aaf Merge pull request #363 from chrismeyersfsu/fix-unicode
allow unicode in stdout.
2015-08-10 11:26:20 -04:00
Chris Meyers
dfff6b218a correctly inherit extra_vars
* inherit extra_vars from job_template
* overwrite with extra vars survey default vars
* overwrite with job extra_vars
* bypass extra_vars inherit logic for job relaunch
* with tests
2015-08-10 11:24:26 -04:00
Matthew Jones
e5bd721b4b Add cleaning site-packages in the Makefile 2015-08-10 11:02:51 -04:00
Matthew Jones
a992881b17 Install honcho in the docker development container 2015-08-10 11:00:27 -04:00
Matthew Jones
5969c6a380 Check for site-packages and if it doesn't exist symlink to the built directory 2015-08-10 10:24:29 -04:00
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
Joe Fiorini
6d03deaf9b Fix testem.yml dependencies 2015-08-07 15:10:12 -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