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

13484 Commits

Author SHA1 Message Date
Ryan Petrello
09055f9c2f fix a few issues in credential type kind validation
- fix a typo from `network` to `net`
- properly update OPTIONS for CredentialTypes to reflect allowed `kind`
  values for POST/PUT/

see: #6959
2017-07-11 09:43:55 -04:00
Ryan Petrello
b79627d57c Merge pull request #6962 from ryanpetrello/fix-6959
prevent creation of custom credential types that != 'cloud || network`
2017-07-10 16:45:08 -04:00
Ryan Petrello
31829038bd prevent creation of custom credential types that != 'cloud || network`
see: #6959
2017-07-10 16:34:25 -04:00
Ryan Petrello
335ab11914 Merge pull request #6958 from ryanpetrello/fix-6534
periodically run orphaned task cleanup as part of the scheduler
2017-07-10 16:13:03 -04:00
Ryan Petrello
0e29f3617d periodically run orphaned task cleanup as part of the scheduler
Running orphaned task cleanup within its own scheduled task via
celery-beat causes a race-y lock contention between the cleanup task and
the task scheduler.  Unfortunately, the scheduler and the cleanup task
both run at similar intervals, so this race condition is fairly easy to
hit.  At best, it results in situations where the scheduler is
regularly delayed 20s; depending on timing, this can cause situations
where task execution is needlessly delayed a minute+.  At worst, it can
result in situations where the scheduler is never able to schedule
tasks.

This change implements the cleanup as a periodic block of code in the
scheduler itself that tracks its "last run" time in memcached (by
default, it performs a cleanup every 60 seconds)

see: #6534
2017-07-10 15:51:46 -04:00
Jared Tabor
5d0a51e2ef Merge pull request #6896 from jaredevantabor/vmware-source
exposing instance_filters and group_by for vmware
2017-07-10 12:30:35 -07:00
Greg Considine
1e26e790eb Merge pull request #6953 from gconsidine/ui/fix/component-browser-inconsistencies
Fix inconsistencies on inputs in Chrome vs. others
2017-07-10 14:48:11 -04:00
Jared Tabor
9bbd1be560 updating vmware popover content
for instance_filters and group_by
2017-07-10 11:18:28 -07:00
Jared Tabor
f8e5e800f8 exposing instance_filters and group_by for vmware 2017-07-10 09:29:38 -07:00
Marliana Lara
35e28e9347 Merge pull request #6903 from marshmalien/copyProjectRevisionIcon
Add copy icon and update Tooltip content to project revision sha
2017-07-10 11:46:14 -04:00
gconsidine
36120b3115 Fix inconsistencies on inputs in Chrome vs. others 2017-07-10 11:27:31 -04:00
Alan Rominger
1a46f7b451 Merge pull request #6952 from AlanCoding/314_merge_tests
Unit test fixes from 3.1.4 merge
2017-07-10 11:21:13 -04:00
AlanCoding
613b9205b8 unit test fixes from 3.1.4 merge 2017-07-10 11:09:56 -04:00
Marliana Lara
7276a3d56a Add changes related to PR review 2017-07-10 10:56:51 -04:00
gconsidine
00fb56fd91 Fix popover text reset on refresh 2017-07-10 10:56:34 -04:00
gconsidine
abb8cd1405 Fix flickering on mouseenter 2017-07-10 10:56:28 -04:00
gconsidine
a868dfb2f2 Add refresh ability to popover on text change 2017-07-10 10:56:24 -04:00
gconsidine
452950ab61 Add alternative trigger event and position support to popover 2017-07-10 10:56:20 -04:00
Marliana Lara
d8384522c2 Remove Revisions directory 2017-07-10 10:56:12 -04:00
Marliana Lara
3d5f7057c3 Add revision component to job details 2017-07-10 10:56:03 -04:00
Marliana Lara
3cc522de8f Add truncate component 2017-07-10 10:55:56 -04:00
Marliana Lara
73ea0b348a Dynamically update Tooltip content based on click 2017-07-10 10:55:53 -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