External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity
20,839 Commits 54 Branches 19 Tags
Commit Graph

20839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald
7d8a910be7 Improve dev environment init process 
This ensures that /etc/passwd is always written, regardless of how the container starts.
 2019-05-10 10:14:51 -04:00
Shane McDonald
015234287c Ensure that a root user is always present in development environment 
@AlanCoding was seeing errors in the development container when trying to run some commands as root. This fixes that.
 2019-05-10 09:16:28 -04:00
softwarefactory-project-zuul[bot]
2910a9dfff
Merge pull request #3858 from shanemcd/unsquash 
Remove --squash option from awx-devel-build

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 14:19:59 +00:00
softwarefactory-project-zuul[bot]
91968a09c8
Merge pull request #3849 from AlanCoding/password_madness 
Reduce passing around of passwords dictionary

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 13:34:43 +00:00
softwarefactory-project-zuul[bot]
190098bbd5
Merge pull request #3848 from AlanCoding/standard_injector 
Move outlier gce cache logic to standard place

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 12:56:11 +00:00
AlanCoding
2585c5030b
move outlier gce cache logic to standard place 2019-05-09 08:24:57 -04:00
Shane McDonald
22858f0044 Remove --squash option from awx-devel-build 
This was intended to save us CI time if / when we switch away from static nodes for Zuul. After merging this in I discovered that this option does not work with `docker build --cache-from`, which will be more benefical in terms of speed improvements anyway.
 2019-05-08 22:22:38 -04:00
AlanCoding
7e6a73f892
fix bug with null credential 2019-05-08 21:18:34 -04:00
AlanCoding
1874e8bb4c
Reduce passing around of passwords dictionary 2019-05-08 21:18:34 -04:00
softwarefactory-project-zuul[bot]
83c286580b
Merge pull request #3852 from shanemcd/dockerfiled 
Refactor Dockerfiles

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 01:08:49 +00:00
Shane McDonald
0be8fe521a Refactor Dockerfiles 
This commit does a few things:

- Add the `--squash` option to the `awx-devel-build` make target. This reduces the resulting image size from 2.12 GB to 1.37 GB. I think we can get this down even more by inspecting the image contents.
- Reorganize commands so that the cache expires less often. Before this commit, any changes to the Makefile would essentially cause the entire image to rebuild.
- Break yum dependencies up into multiple lines. This makes it easier to see what changes in a diff.
- Use `n` to install our required version of node (rather `curl node | bash`). I’ve found this to be easier to maintain / more portable when working with other Dockerfiles.
- General organizational changes to make things easier to parse visually.
 2019-05-08 20:36:41 -04:00
softwarefactory-project-zuul[bot]
186ec88581
Merge pull request #3839 from zicklam/webhook_disable_ssl_verify 
Add "Disable SSL Verification" checkbox to webhook notification

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 19:44:11 +00:00
softwarefactory-project-zuul[bot]
6407ab58ff
Merge pull request #3855 from ryanpetrello/improved-dev-code-reload 
remove honcho in the dev environment (just use foregrounded supervisor)

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 19:25:57 +00:00
Ryan Petrello
766a5c0c3f
remove honcho in the dev environment (just use foregrounded supervisor) 
using supervisor gives us the ability to restart entire processes on
code change (like the dispatcher and callback receiver)
 2019-05-08 14:44:07 -04:00
softwarefactory-project-zuul[bot]
70972f7ea1
Merge pull request #3850 from jbradberry/reload-dispatcher-on-code-change 
Make the uwsgi autoreloader reload the dispatcher every time

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 16:11:04 +00:00
Jeff Bradberry
ae25717700 Make the uwsgi autoreloader reload the dispatcher every time 
not just the first time uwsgi is brought up.

related #3846
 2019-05-08 11:15:54 -04:00
softwarefactory-project-zuul[bot]
e05c6e67b6
Merge pull request #3837 from saito-hideki/issue/2891 
Add credential info in expanded list view of inventory update

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 13:37:34 +00:00
zicklam
42f30e72b5 False is not false 2019-05-08 08:35:26 +02:00
zicklam
0fb3851a2b webhook_notification set default for var 'disable_ssl_verification' 2019-05-08 08:21:04 +02:00
softwarefactory-project-zuul[bot]
c7fe840868
Merge pull request #3810 from vismay-golwala/restrict_copy_jt 
Raise meaningful error when permission denied to copy JT

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-07 13:52:04 +00:00
Vismay Golwala
0154d80f19 Raise meaningful error when permission denied to copy JT 
When a user doesn't have access to all the credentials of a job
template, they cannot copy the JT. However, currently we raise a
default `PermissionDenied`, which doesn't give the user insight
into what's wrong. So, this PR just adds a custom message indicating
that access to credentials is missing.

Signed-off-by: Vismay Golwala <vgolwala@redhat.com>
 2019-05-06 15:02:36 -04:00
zicklam
08d60d0b78 Update test_notification Template for webhooks 
- rename webhook_no_verify_ssl to disable_ssl_verification
 2019-05-06 19:20:00 +02:00
softwarefactory-project-zuul[bot]
6908558acd
Merge pull request #3833 from ryanpetrello/iso-mem-cpu 
properly record Instance.cpu and Instance.memory for isolated nodes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-06 16:14:18 +00:00
softwarefactory-project-zuul[bot]
4dc7178f3c
Merge pull request #3785 from AlanCoding/no_output_replacements 
Remove unused output_replacements logic

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-06 16:11:51 +00:00
Hideki Saito
418521f4a3 Add credential info in expanded list view of inventory update 
- Fixed issue #2891

Signed-off-by: Hideki Saito <saito@fgrep.org>
 2019-05-06 13:28:47 +00:00
zicklam
5b8fba58e8 Add "Disable SSL Verification" checkbox to webhook notification 
This commit will add a checkbox which will disable SSL verification on
the generic webhook notification type. This is required when using
self-signed certificates.
 2019-05-06 13:12:41 +02:00
Ryan Petrello
c6c14d4fb9
properly record Instance.cpu and Instance.memory for isolated nodes 2019-05-03 15:30:41 -04:00
softwarefactory-project-zuul[bot]
cf6a103207
Merge pull request #3818 from ryanpetrello/devel 
merge in downstream changes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-03 14:36:56 +00:00
softwarefactory-project-zuul[bot]
e5cf5be18d
Merge pull request #3815 from pmoravec/awx-pmoravec-tower-sos-plugin-improvements 
sosreport plugin improvements

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-03 12:47:39 +00:00
softwarefactory-project-zuul[bot]
f26ae8ef13
Merge pull request #3714 from vismay-golwala/org_member_count 
Show only member users for organization

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-03 12:36:29 +00:00
softwarefactory-project-zuul[bot]
755c3e89e2
Merge pull request #3801 from vismay-golwala/copy_credential 
Copy credential bug - add owner too

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
 2019-05-03 12:31:59 +00:00
softwarefactory-project-zuul[bot]
2800e89fd2
Merge pull request #3783 from AlanCoding/passwords_and_relaunching 
Allow relaunching other user jobs with public vars

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-03 12:03:26 +00:00
Ryan Petrello
8d75fc5f56
Merge branch 'downstream' into devel 2019-05-03 07:58:25 -04:00
softwarefactory-project-zuul[bot]
17d2efde95
Merge pull request #3789 from AlanCoding/rm_fields 
Remove job ask_ fields that reference JT

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-03 11:42:19 +00:00
Pavel Moravec
8909a8a8e4 sosreport plugin to stick on sos >= 3.0 API only 
As sosreport 3.0 was released 5 years ago, older sos versions can
be ignored / not further supported.

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
 2019-05-03 10:38:34 +02:00
Michael Abashian
4be05f1bf6
Merge pull request #3535 from mabashian/job-events-collapse 
Fix inert event expand/collapse on refreshed job results
 2019-05-02 16:41:13 -04:00
Pavel Moravec
29822ee140 don't collect data from other sosreport plugins 
Tower plugin shouldn't collect data that other sosreport plugins collect.

Further, few code optimizations in calling sos API are made.

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
 2019-05-02 21:45:09 +02:00
Ryan Petrello
7fc13b8bb5
Merge pull request #3538 from ryanpetrello/valid-netloc 
require a valid netloc for Credential Type inputs w/ format=url
 2019-05-02 15:08:48 -04:00
Ryan Petrello
e560dccd36
require a valid netloc for Credential Type inputs w/ format=url 2019-05-02 14:49:02 -04:00
Ryan Petrello
de56e20f11
Merge pull request #3536 from ryanpetrello/urllib3-1.24.3 
pin urllib3 to 1.24.3 to address CVE-2019-9740
 2019-05-02 14:27:10 -04:00
Michael Abashian
d4cc595630
Merge pull request #3510 from mabashian/3506-sort-more-fields 
Add more sort options to new lists
 2019-05-02 14:17:36 -04:00
mabashian
b754e0dbba Fix template sorting by project 2019-05-02 13:55:20 -04:00
softwarefactory-project-zuul[bot]
72fe6e400e
Merge pull request #3802 from AlanCoding/playbook_search 
Include playbook as a default search field

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-02 16:54:21 +00:00
Ryan Petrello
6bb9902588
pin urllib3 to 1.24.3 to address CVE-2019-9740 2019-05-02 11:59:01 -04:00
mabashian
04d22a930d Fix inert event expand/collapse on refreshed job results 2019-05-02 10:43:56 -04:00
softwarefactory-project-zuul[bot]
fe3a2d1a4e
Merge pull request #3803 from ryanpetrello/matter-of-fact 
remove references to the (now defunct) fact receiver

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-02 13:34:12 +00:00
Ryan Petrello
50f9c70afd
remove references to the (now defunct) fact receiver 2019-05-01 23:48:05 -04:00
softwarefactory-project-zuul[bot]
5ab7f888f1
Merge pull request #3800 from AlanCoding/event_children_list 
Populate event children list via parent_uuid

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-02 00:37:03 +00:00
AlanCoding
7d692d08f9
include playbook as a default search field 2019-05-01 16:15:00 -04:00
softwarefactory-project-zuul[bot]
f3c023a11f
Merge pull request #3765 from beeankha/task_doc_update 
Add Task Overview Details to tasks.md

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-01 20:02:15 +00:00