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

21071 Commits

Author SHA1 Message Date
softwarefactory-project-zuul[bot]
0d3f1f4ac2
Merge pull request #3871 from ryanpetrello/devel
merge in downstream changes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-10 16:21:39 +00:00
softwarefactory-project-zuul[bot]
18c69fa391
Merge pull request #3870 from shanemcd/gimme-root
Ensure that a root user is always present in development environment

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-10 14:57:58 +00:00
softwarefactory-project-zuul[bot]
6d6eae571e
Merge pull request #3868 from jakemcdermott/ig-order-docstring
add docstring and test for instance group service

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-10 14:54:52 +00:00
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
Jake McDermott
df04660cdd
add test for instance groups service 2019-05-10 10:05:05 -04:00
softwarefactory-project-zuul[bot]
9d1ed837f9
Merge pull request #3869 from AlanCoding/dev_supervisor_fix
Fix bug in dev supervisor reparenting processes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-10 13:45:30 +00:00
Ryan Petrello
be4705ef8b
Merge branch 'downstream' into devel 2019-05-10 09:18:07 -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
AlanCoding
677a8b34ba
Fix bug in dev supervisor reparenting processes 2019-05-10 07:46:53 -04:00
Jake McDermott
232c706b75
add docstring for instance group service 2019-05-10 07:16:50 -04:00
softwarefactory-project-zuul[bot]
8725d3e539
Merge pull request #3842 from ryanpetrello/instance-group-order
enforce a stable list order when attaching/detaching instance groups

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-09 21:04:29 +00:00
softwarefactory-project-zuul[bot]
e7290e6452
Merge pull request #3864 from rooftopcellist/more_verbose_instance_msg
more verbose list_instance messaging

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-09 19:31:24 +00:00
Christian Adams
21105b836e more verbose list_instance messaging 2019-05-09 15:08:56 -04:00
softwarefactory-project-zuul[bot]
99dc84c275
Merge pull request #3863 from ryanpetrello/makefile-supervisor
use make targets for dev supervisor commands

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-09 18:07:39 +00:00
Ryan Petrello
adfdfcdd0a
use make targets for dev supervisor commands 2019-05-09 13:45:49 -04:00
softwarefactory-project-zuul[bot]
6feb58f76d
Merge pull request #3853 from AlanCoding/variable_data_permission
Put variable data permission in its own class

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-09 16:48:11 +00: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
beeankha
371966613f Update AWX docs 2019-05-09 10:03:57 -04: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
Michael Abashian
466e965047
Merge pull request #3549 from mabashian/host_filter_or
Fixes basic host filter searches
2019-05-08 15:16:43 -04:00
mabashian
e1de0a528d Adds some test coverage for host_filter queries 2019-05-08 14:59:04 -04: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
AlanCoding
231abf865b
put variable data permission in its own class 2019-05-08 13:43:13 -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
Ryan Petrello
993b0a889d add API tests for InstanceGroup order persistence 2019-05-08 11:56:30 -04:00
Jake McDermott
205f2c33c1
wait for instance group requests on template save 2019-05-08 11:56:19 -04:00
Jake McDermott
1e77053bbf
handle re-ordering of instance groups 2019-05-08 11:56:05 -04: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
mabashian
11244f85a4 Adds missing semicolon 2019-05-08 10:05:02 -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
Ryan Petrello
e4a50f3595
enforce a stable list order when attaching/detaching instance groups 2019-05-07 14:53:00 -04:00
mabashian
f524c94bad Fixes basic host filter searches 2019-05-07 14:43:53 -04: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
Michael Abashian
b85cc716a4
Merge pull request #3542 from mabashian/3540-groups-layout
Fix display bug on host groups list
2019-05-06 11:16:30 -04: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