shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity
13,463 Commits 40 Branches 19 Tags 380 MiB
8486944eaa
Commit Graph

13463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones
8486944eaa Switch out existing obfuscated license with external module 
This creates a new fallback license module called StubLicense that
will be used in the event that the tower_license module is not
installed.

All existing license mechanisms are routed through the get_licenser()
util method
 2017-07-11 12:01:24 -04:00
Chris Meyers
7fda3c0658 back out thought to cause deadlock scenario 2017-07-10 10:43:29 -04:00
Chris Meyers
aeb7119796 fix 2 data source inconcistency with failing tasks 
* Do not "trust" the list of celery ids for database entries that were
modified after the list of celery ids was gotten.
* err on the side of caution and just let the next heartbeat celery
killer try killing the task if it needs to be reaped.
 2017-07-10 10:43:01 -04:00
Chris Meyers
5b9a0b504a celery task fail check now uses pglock 
* Align locking used by celery task cleaner upper with regular task manager.
* Uses pglock/advisory lock instead of abusing Instance table lock.
 2017-07-10 10:41:54 -04:00
Chris Meyers
7a795b8681 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-07-10 10:34:36 -04:00
AlanCoding
459c33d272 More consistently provide fields in job_events logger 
* Change scheme from using event dict to JobEvent object
* Add processing to grok object fields
* Allow override of provided formatter in case of future issues
 2017-07-10 10:34:04 -04:00
Ryan Petrello
7d12427497 add a new configurable, PROXY_IP_WHITELIST 
implement a whitelist setting that - if populated - will only allow
specific IPs/hostnames to provide custom REMOTE_HOST_HEADERS header
values (i.e., `HTTP_X_FORWARDED_FOR`)

see: #6538
 2017-07-10 10:31:45 -04:00
Christian Adams
c821df7fd5 Amended diff mode addition 2017-07-10 10:28:47 -04:00
Christian Adams
13d46899d1 Add --diff mode 2017-07-10 10:25:54 -04:00
Christian Adams
b79600d2e5 Merge pull request #6529 from rooftopcellist/contributing_update 
Adds information on creating a super user and preloading demo data when initializing a development environment.
 2017-07-08 21:09:28 -04:00
Chris Meyers
f2fa982970 Merge pull request #6943 from chrismeyersfsu/fix-6941 
migrations do not call overwitten save() methods
 2017-07-07 16:52:32 -04:00
Chris Meyers
df572d1477 migrations do not call overwitten save() methods 
related to #6941

* We don't want our special logic to trigger anyway.
 2017-07-07 16:47:07 -04:00
Ryan Petrello
f58ebf54e7 Merge pull request #6940 from ryanpetrello/fix-6900 
don't auto-coerce boolean-like extra_vars for credential injection
 2017-07-07 16:30:12 -04:00
Ryan Petrello
7f286b50b8 don't auto-coerce boolean-like extra_vars for credential injection 
ansible itself already does this for you (albeit, with its own set of
quirks): https://github.com/ansible/ansible/issues/11905

see: #6900
 2017-07-07 16:11:29 -04:00
Christian Adams
3ae9578725 Merge pull request #6933 from rooftopcellist/diff_mode_feature 
Diff mode feature
 2017-07-07 16:04:40 -04:00
adamscmRH
b5d0224720 Adds on_launch --diff on api 2017-07-07 15:23:13 -04:00
adamscmRH
ecef799a5a adds Playbook & AdHoc Diff 2017-07-07 15:23:13 -04:00
adamscmRH
d57bc3b59c Add --diff feature to API 2017-07-07 15:23:13 -04:00
Ryan Petrello
a515a174e6 Merge pull request #6931 from ryanpetrello/fix-6924 
properly copy prompted vault passwords on job launch
 2017-07-07 13:40:35 -04:00
Alan Rominger
757f5cec70 Merge pull request #6927 from AlanCoding/new_ui_target 
Mew target to make the UI
 2017-07-07 13:37:05 -04:00
Alan Rominger
bd07bec813 Merge pull request #6923 from AlanCoding/datetime_warning 
fix datetime warning
 2017-07-07 13:32:57 -04:00
Ryan Petrello
5fde6ead42 properly copy prompted vault passwords on job launch 
see: #6924
 2017-07-07 13:15:17 -04:00
Ryan Petrello
8e59786333 Merge pull request #6929 from ryanpetrello/fix-6924 
fix a variety of bugs that break vault pass injection for playbook runs
 2017-07-07 13:05:02 -04:00
Marliana Lara
8175881474 Merge pull request #6921 from marshmalien/6917-JTLaunchPayload 
Revise PromptOnLaunch verbosity and job_type payload
 2017-07-07 12:32:57 -04:00
Ryan Petrello
3c2fe5e6db fix a variety of bugs that break vault pass injection for playbook runs 
see: #6924
 2017-07-07 12:19:31 -04:00
AlanCoding
592df0c8e2 new target to make the UI 2017-07-07 11:37:51 -04:00
AlanCoding
5711378d92 fix datetime warning 2017-07-07 10:38:09 -04:00
Michael Abashian
463ef9d4b0 Merge pull request #6855 from mabashian/6545-manual-inv-source 
Make source field required
 2017-07-07 09:35:44 -04:00
Michael Abashian
b4ae29e34b Merge pull request #6914 from mabashian/associate-host-preview 
Show multiselect preview when associating related hosts
 2017-07-07 09:31:01 -04:00
Alan Rominger
99834a8552 Merge pull request #6920 from AlanCoding/6873 
Prevent server error in POST to group hosts
 2017-07-07 09:26:53 -04:00
Alan Rominger
447624fd47 Merge pull request #6919 from AlanCoding/ask_vault 
include vault_credentials in ask_for_passwords and launch summary
 2017-07-07 09:25:11 -04:00
Marliana Lara
dcbc34bb9d Revise payload to send a string or integer instead of an object 2017-07-07 09:05:09 -04:00
AlanCoding
0a339ed05c prevent server error in POST to group hosts 2017-07-07 08:24:50 -04:00
AlanCoding
a2e88a9cdf include vault_credentials in passwords and launch summary 2017-07-07 07:57:34 -04:00
Michael Abashian
4515e90963 Show multiselect preview when associating related hosts 2017-07-06 16:58:00 -04:00
Michael Abashian
d4cd5a958c Added our filter for Manual sources back in 2017-07-06 16:16:05 -04:00
Michael Abashian
527728176e Make source required (again) 2017-07-06 16:05:58 -04:00
Michael Abashian
0889cbaf3b Remove source required field 2017-07-06 16:05:58 -04:00
Michael Abashian
7d2e1de424 Make source field required and don't filter out Manual source type 2017-07-06 16:05:57 -04:00
Michael Abashian
ed3e03644b Merge pull request #6907 from mabashian/fix-groups-tab 
Changed GroupList from value to factory
 2017-07-06 14:31:25 -04:00
Matthew Jones
ee4449eed5 Use static secret key in generated dockerfile 2017-07-06 14:21:36 -04:00
Michael Abashian
407647e415 Changed GroupList from value to factory 2017-07-06 14:17:36 -04:00
Ryan Petrello
41001edf58 Merge pull request #6902 from ryanpetrello/fix-3508 
Support AWX_TASK_ENV injection in task and notification invocations.
 2017-07-06 14:01:13 -04:00
Ryan Petrello
12d41e2deb Support AWX_TASK_ENV injection in task and notification invocations. 
This change _only_ injects `AWS_TASK_ENV` into `os.environ`; it's up to
underlying libraries to be good citizens and actually respect things
like `HTTPS_PROXY`.

see: #3508
 2017-07-06 13:51:37 -04:00
Jared Tabor
3107cf0f72 Merge pull request #6863 from mabashian/6858-reset-source-type 
Fixed console error when switching source type back to Choose a source
 2017-07-06 09:46:31 -07:00
Jared Tabor
270d88be1d Merge pull request #6878 from jaredevantabor/insights 
show/hide Insights action buttons
 2017-07-06 09:45:31 -07:00
Michael Abashian
c2b552b3b2 Removed erroneous credential basepath line 2017-07-06 12:01:46 -04:00
Michael Abashian
a58b33e7c7 Merge pull request #6812 from mabashian/inventories-i18n 
Marked strings for translation in the inventories-hosts directory
 2017-07-06 11:30:58 -04:00
Michael Abashian
929ab0d5ce Merge branch 'devel' into inventories-i18n 2017-07-06 11:30:43 -04:00
Chris Meyers
e04c4e30d8 update tests to fix the removal of the word Tower 2017-07-06 11:22:16 -04:00