15397 Commits

Author SHA1 Message Date
Bill Nottingham
40c22dcec8
Merge pull request #643 from wenottingham/whitespace-the-final-frontier
Fix extra whitespace in callback URL.
2017-11-29 11:29:45 -05:00
Alan Rominger
04f682bf7a
Merge pull request #694 from AlanCoding/credentials_not_a_thing
adjust assertions about JT credentials to be correct
2017-11-29 10:41:48 -05:00
Alan Rominger
070a12a10c
Merge pull request #692 from AlanCoding/vault_credential_check
Modify JT access tests to reflect new vault_credential reality
2017-11-29 10:40:35 -05:00
Wayne Witzel III
53460db4d7
Merge pull request #736 from ewjoachim/fix-social-core
Fix import of social_core.exceptions in sso/pipeline.py
2017-11-29 09:26:43 -05:00
Joachim Jablon
6609f38fa2
Fix import of social_core.exceptions in sso/pipeline.py
Signed-off-by: Joachim Jablon <ewjoachim@gmail.com>
2017-11-29 14:08:58 +01:00
Alan Rominger
8f5be46d52
Merge pull request #730 from AlanCoding/list_bug
fix bug with inventory update queryset
2017-11-28 18:41:39 -05:00
Bill Nottingham
3866dcaaae
Merge pull request #732 from wenottingham/quote-fu
Remove stray quote from help string.
2017-11-28 15:38:42 -05:00
Bill Nottingham
8cede51bac Remove stray quote from help string. 2017-11-28 14:32:39 -05:00
AlanCoding
a880f47925
fix bug with inventory update queryset 2017-11-28 14:13:35 -05:00
Shane McDonald
32fcb84cf6
Merge pull request #722 from jakemcdermott/tools-awx-pycrypto
add pycrypto distro package to tools awx container image
2017-11-28 13:42:02 -05:00
Jake McDermott
34195a1b35
add pycrypto distro package to tools awx container image 2017-11-28 12:45:53 -05:00
Greg Considine
c723ba5289
Merge pull request #717 from gconsidine/ui/bump-dependency-versions
Update dependency versions to pull in latest 1.x Angular version
2017-11-28 10:11:12 -05:00
gconsidine
3ff9fa9931
Remove test on async fn with no callback and no returned promise 2017-11-28 09:54:54 -05:00
Wayne Witzel III
3202e77b57
Merge pull request #720 from wwitzel3/devel
Update to asgi_amqp 1.0.1
2017-11-27 14:57:39 -05:00
Wayne Witzel III
a858093db8 Update to asgi_amqp 1.0.1 2017-11-27 19:41:30 +00:00
gconsidine
86a559caef
Update dependency versions to pull in latest 1.x Angular version 2017-11-27 11:12:45 -05:00
Michael Abashian
33ff10728d
Merge pull request #680 from mabashian/delete-warning-text
Tweaked language on delete warning modal
2017-11-22 15:02:55 -05:00
mabashian
ff1f322c88
Removed unused string from credentials strings 2017-11-22 13:29:52 -05:00
mabashian
d3da899459
Defined delete string in the base with the ability to pass the resource name in 2017-11-22 13:28:02 -05:00
AlanCoding
9fe524cd20
adjust assertions about JT credentials to be correct 2017-11-21 10:03:57 -05:00
AlanCoding
1481a62b23
modify JT access tests to reflect new vault_credential reality 2017-11-21 08:40:04 -05:00
Alan Rominger
ce6d96feda
Merge pull request #687 from AlanCoding/new_kill
allow deletion of new jobs
2017-11-21 07:20:05 -05:00
AlanCoding
6c57a3bb68
allow deletion of new jobs 2017-11-20 11:19:22 -05:00
mabashian
565b0b82dd
Tweaked language on delete warning modal 2017-11-17 12:45:01 -05:00
Matthew Jones
9b5371f2ab
Merge pull request #670 from chrismeyersfsu/job_events_docs
add docs for job events
2017-11-16 13:46:35 -05:00
Chris Meyers
c4e6fc23fc add docs for job events
* Focus on the ordering of Job Event creation. Important to know when
thinking through different Ansible execution strategies.
2017-11-16 12:48:48 -05:00
Alan Rominger
71127c039d
Merge pull request #668 from AlanCoding/null_cred_okay2
Do not filter out JTs with null credentials
2017-11-16 11:18:16 -05:00
AlanCoding
127da5525c
do not filter out JTs with null credentials 2017-11-16 10:20:41 -05:00
Alan Rominger
0f52ab47a0
Merge pull request #665 from AlanCoding/prefetch_credentials
prefetch UnifiedJob related credentials
2017-11-16 09:57:22 -05:00
Matthew Jones
b06a508ceb
Merge pull request #651 from tumbl3w33d/646_configurable_search_domains
Make DNS search domain configurable for awx containers
2017-11-15 23:32:16 -05:00
AlanCoding
8cb5ce8307
prefetch UnifiedJob related credentials 2017-11-15 22:35:10 -05:00
Benjamin Wenzel
c1aa4129f9 Make DNS search domain configurable for awx containers
related #646
2017-11-15 21:11:56 +01:00
Matthew Jones
d6b10b7f44
Merge pull request #657 from ansible/openshift_fixes
Openshift fixes
2017-11-15 13:29:41 -05:00
Shane McDonald
e2aa9dc599
Merge pull request #658 from shanemcd/devel
Enable image stream lookups in AWX OpenShift Project
2017-11-15 13:21:51 -05:00
Shane McDonald
a043369d07 Enable image stream lookups in AWX OpenShift Project
See the OpenShift docs on this for more info: https://docs.openshift.com/container-platform/3.6/dev_guide/managing_images.html#using-is-with-k8s

If you are not using OpenShift’s internal registry you will need to manually set awx_task_openshift_image and awx_web_openshift_image.
2017-11-15 13:15:56 -05:00
Matthew Jones
03eca250d9
Fix an openshift issue writing the inventory file
Openshift was throwing an error here, though I'm not sure why it makes
a whole lot of difference to call fdopen() vs open(). This was
introduced when this method was unified under the new
ansible-inventory system. This fixes it for all cases. mkstemp(),
while not necessary, is a useful addition to keep from leaking
inventory details unnecessarily.
2017-11-15 13:12:54 -05:00
Matthew Jones
65d01d508b
Fix an issue with handler tasks after celery upgrade
There's a bug in celery 4.X when using bound tasks as error
handlers. We don't actually need it to be bound especially since the
request object is now available in the function signature
2017-11-15 13:12:06 -05:00
Ryan Petrello
3a2ec25fb4
Merge pull request #649 from ryanpetrello/multicred
fix a permissions bug for credentials specified at JT launch time
2017-11-15 08:49:08 -05:00
Ryan Petrello
fa09d68603
add a few minor optimizations and some refactoring for multi-cred 2017-11-14 16:47:28 -05:00
Ryan Petrello
eb140d9e69
fix a permissions bug for credentials specified at JT launch time
hat tip to @alancoding for spotting this one
2017-11-14 16:21:05 -05:00
Jared Tabor
5852c16ba6
Merge pull request #613 from jaredevantabor/fix-569
removing codemirror instantiation from $transition event
2017-11-14 11:09:41 -08:00
Ryan Petrello
ebd8941439
Merge pull request #595 from ryanpetrello/multicred
replace all Job/JT relations with a single M2M credentials relation
2017-11-14 14:07:18 -05:00
Jared Tabor
32cb18fc85
removing codemirror instantiation from $transition event 2017-11-14 10:24:36 -08:00
Ryan Petrello
28ce9b700e
replace all Job/JT relations with a single M2M credentials relation
Includes backwards compatibility for now-deprecated .credential,
.vault_credential, and .extra_credentials

This is a building block for multi-vault implementation and Alan's saved
launch configurations (both coming soon)

see: https://github.com/ansible/awx/issues/352
see: https://github.com/ansible/awx/issues/169
2017-11-14 12:49:12 -05:00
Bill Nottingham
0558bd82bb Fix extra whitespace in callback URL. 2017-11-14 12:03:52 -05:00
Ryan Petrello
f887aaa71f
Merge pull request #637 from ryanpetrello/fix-django-settings-bug
undo an optimization in django.conf.settings that breaks awx settings
2017-11-14 11:56:24 -05:00
Matthew Jones
799feac0e1
Merge pull request #638 from shanemcd/devel
Fix OpenShift configmap
2017-11-14 11:40:12 -05:00
Shane McDonald
0d86678a44 Fix OpenShift configmap
These variables changed in 8faf5887754addeb4940f73a6e02a380f7623541
2017-11-14 11:32:05 -05:00
Ryan Petrello
38f893c124
undo an optimization in django.conf.settings that breaks awx settings 2017-11-14 11:03:50 -05:00
Greg Considine
a2b444f179
Merge pull request #625 from gconsidine/ui/fix/home-dashboard-popover
Revert versions of D3 used by awx and ansible/nvd3
2017-11-14 10:48:40 -05:00