1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Commit Graph

4907 Commits

Author SHA1 Message Date
Matthew Jones
896b0e18f3 Merge remote-tracking branch 'chrismeyers/feature-configure_offline' into release_2.3
* chrismeyers/feature-configure_offline:
  configure support inventory file
  retain existing behavior with added --inventory-file param
2015-08-24 14:38:30 -04:00
Chris Meyers
442de37441 Merge pull request #386 from chrismeyersfsu/fix-offline_remote
move offline check from preflight to setup.sh
2015-08-24 12:21:16 -04:00
Chris Meyers
30dc5ec434 remove hard coded epel6 build; support epel 7
* corrects epel7 testing .repo
2015-08-24 11:45:38 -04:00
Chris Meyers
e210eeaf59 Merge branch 'release_2.3' into fix-offline_remote 2015-08-24 08:54:32 -04:00
Chris Meyers
c038bdb1d5 flake8 fixes 2015-08-24 08:48:53 -04:00
Matthew Jones
1ead738f96 Updates to offline packager docker environment 2015-08-21 16:40:35 -04:00
Chris Meyers
38435648c6 Merge branch 'feature-offline_merge' into release_2.3 2015-08-21 16:21:12 -04:00
Matthew Jones
1471a3bb3e Allow proot's base tmp path to be configurable 2015-08-21 15:28:39 -04:00
Matthew Jones
7080996670 Cleanup stdout dump during 2.2 migration
postgres is adding extra newline/carriage return escapes to the stdout
output.  Here we'll use sed to fix those so they can be read correctly
2015-08-21 13:28:34 -04:00
Matthew Jones
4ce2300d27 Bump version number for 2.3.0 release 2015-08-21 11:55:19 -04:00
Matthew Jones
c5ce9cdc12 Fix stdout plaintext render
* Was rendering as json (though text/plain)
* Switched to rendering it as normal text with stripped ansi
* Fixes: https://trello.com/c/TMyOak0H/142-api-v1-jobs-n-stdout-format-txt-emits-json-output
2015-08-21 10:20:57 -04:00
Matthew Jones
a76b1a0432 Merge branch 'release_2.2.3' into stable
* release_2.2.3:
  Bump version to 2.2.3
  Optimize inventory read check for Job Templates
2015-08-20 11:15:48 -04:00
Chris Meyers
a9e4377683 removed need for DIST and DIST_MAJOR specification 2015-08-20 10:46:04 -04:00
Chris Meyers
59b5722838 init offline installer builder 2015-08-20 10:41:28 -04:00
Matthew Jones
f66ed43788 Bump version to 2.2.3 2015-08-19 13:26:55 -04:00
Matthew Jones
2bdc79f3ba 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-08-19 13:26:10 -04:00
Matthew Jones
26f942a593 Merge remote-tracking branch 'upstream/release_2.2' into stable
* upstream/release_2.2: (31 commits)
  Updating changelog for 2.2 release
  Bump version to 2.2.2
  Use smart_str instead of .encode on passwords
  Change default sensitive redaction behavior
  Update changelogs for 2.2.1
  Add an error message when running a job and trying to use an OpenSSH formatted key on an older version of OpenSSH.
  Revert "Add sudo: true to the backup playbook"
  Handle Ubuntu 12.04 psutil recursive cancel
  fixed log viewer modal partial
  fixed alignment of download standard out button in modals
  About Tower version number fix
  Pin package version for older release
  add standard out download button to various places in the UI
  Bump 2.2 branch to version 2.2.1
  Don't create a group that is its own parent when an EC2 tag has an empty value.  Fixes https://trello.com/c/2zc0odvX
  Limit max depth when building mapping of group depths to avoid hitting recursion limit.  Fixes https://trello.com/c/2zc0odvX
  Fix .ini web links for v2
  Add support for detecting encrypted openssh format private keys. Fixes https://trello.com/c/ZeVOXN5U
  Fix psutil usage on el6 for job cancel
  Set recursive on child process canceling
  ...
2015-08-19 10:39:54 -04:00
James Laska
853c2b09ee Make flake8 happy 2015-08-17 16:24:10 -04:00
James Laska
d30605d82d Fix import error by calling prepare_env first 2015-08-17 16:24:04 -04:00
Chris Meyers
171d5abf33 allow unicode in stdout. 2015-08-17 14:30:00 -04:00
Chris Meyers
a07bc30be7 successfully install requirements on python 2.6
jsonschema conditionally pulls in functools32 if python2.7 else it uses
2.6 packages.
2015-08-17 14:29:46 -04:00
James Laska
2de6be9cfe Simplify Makefile requirements targets 2015-08-17 14:13:44 -04:00
Matthew Jones
35ffb37492 Add cleaning site-packages in the Makefile 2015-08-17 11:33:45 -04:00
Chris Meyers
99fb641b1b all vendor dependencies expressed in requirements.txt 2015-08-17 11:17:53 -04:00
James Laska
717f646430 Bump version to 2.2.2 2015-08-14 08:16:57 -04:00
Matthew Jones
ee8a76f32b Use smart_str instead of .encode on passwords
We originally tried to prune these .encode() calls out of the tree in
favor of smart_str but we must have missed this one.   This allows
migration 0066 to work if utf-8 characters are used in the password
2015-08-13 17:00:46 -04:00
Matthew Jones
d4dccff20c Change default sensitive redaction behavior
* Only project updates will contain sensitive data redaction logic when
  displaying stdout
2015-08-13 15:48:56 -04:00
Chris Church
6128ab3ff4 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:54:54 -04:00
Matthew Jones
21acaa999d 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:32:29 -04:00
John Mitchell
678fbd3328 fixed log viewer modal partial 2015-08-11 09:48:43 -04:00
John Mitchell
9105612c6a fixed alignment of download standard out button in modals 2015-08-10 15:43:00 -04:00
Jared Tabor
f7b0da7be5 About Tower version number fix
for parsing versions such as "2.3.0" and "2.3.0-0.git201507231538"
2015-08-10 10:02:45 -07:00
John Mitchell
642215f9f3 add standard out download button to various places in the UI 2015-08-07 11:23:12 -04:00
Matthew Jones
7484267186 Bump 2.2 branch to version 2.2.1 2015-08-07 11:19:09 -04:00
Chris Church
139a072afa 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 21:31:56 -04:00
Chris Church
001127f8bd Limit max depth when building mapping of group depths to avoid hitting recursion limit. Fixes https://trello.com/c/2zc0odvX 2015-08-06 21:31:42 -04:00
Bill Nottingham
1982177248 Fix .ini web links for v2
This moved in the github repo.
2015-08-05 22:04:21 -04:00
Chris Church
f0010cc574 Add support for detecting encrypted openssh format private keys. Fixes https://trello.com/c/ZeVOXN5U 2015-08-05 22:03:20 -04:00
Matthew Jones
3b96c3ca52 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 22:01:44 -04:00
Matthew Jones
31b8491d53 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 22:00:27 -04:00
Chris Meyers
b01c2d2ad1 fixes stoud formats unicode problem 2015-08-05 21:59:05 -04:00
Matthew Jones
57778eb429 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 21:55:02 -04:00
Matthew Jones
b1c12ca120 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-05 21:54:23 -04:00
Matthew Jones
dc0d732ad4 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-05 21:53:46 -04:00
Matthew Jones
c0ea174e93 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-05 21:52:47 -04:00
Chris Meyers
408e25442d flake8 fixes 2015-07-15 12:18:46 -04:00
James Laska
316d0c0f77 Continue, don't break out of the iteration 2015-07-14 14:53:57 -04:00
James Laska
bca8bae508 Only check if mongo is needed locally 2015-07-14 12:10:01 -04:00
James Laska
81c4abfed8 Correct initscript order and mongod detection
In addition to starting and stopping mongod in the correct order, the check for
determining whether mongod is required needs to happen when the service is
managed.
2015-07-14 11:14:13 -04:00
Matthew Jones
7fd4613523 Remove uses_mongo redirection from service script 2015-07-13 15:44:58 -04:00