External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-02 10:08:10 -03:30
Code Issues Packages Projects Releases Wiki Activity
25,073 Commits 55 Branches 102 Tags
843c22c6b192616291ada604b275e1319e2dad93
Commit Graph

25073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth Foster
843c22c6b1 Allow orphaned user to be added to org 
Fixed bug where an org admin was not able to add
an orphaned user to the org, in the case where the
orphan had an ancestor role that matched one of the
roles for of the org admin.

scenario to fix -- sue is member of cred1, where cred1 is
part of org1. org1 admin cannot add sue to org1, because
the cred1 role for sue has an ancestor to org1 role. The org1
admin cannot change or attach sue to org1.

tower issue #4198 and #4197
 2020-04-02 14:24:55 -04:00
softwarefactory-project-zuul[bot]
99384b1db9 Merge pull request #6506 from shanemcd/stateless-set 
Switch from StatefulSet to Deployment

Reviewed-by: Matthew Jones <mat@matburt.net>
             https://github.com/matburt
 2020-04-02 17:51:25 +00:00
Shane McDonald
d57258878d Update more references to statefulset 2020-04-02 12:44:26 -04:00
softwarefactory-project-zuul[bot]
48414f6dab Merge pull request #6542 from chrismeyersfsu/fix-align_redis 
Fix align redis

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-02 16:22:31 +00:00
Shane McDonald
ff0186f72b Delete k8s StatefulSet if it exists (for upgrades) 2020-04-02 12:21:35 -04:00
softwarefactory-project-zuul[bot]
a682565758 Merge pull request #6385 from AlexSCorey/6317-ConvertJTFormstoFormikHooks 
Uses formik hooks for JT Form

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-02 15:52:35 +00:00
softwarefactory-project-zuul[bot]
0dee2e5973 Merge pull request #6482 from AlexSCorey/5901-SupportForWFJTSurvey 
Adds Survey Functionality to WFJT

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-02 15:19:21 +00:00
chris meyers
929f4bfb81 start redis container with conf file 2020-04-02 11:13:35 -04:00
Alex Corey
fb4343d75e Removes uncessary formikContext items in favor of useField. 
Removed OrgId value from formik and get that value from project field
Updates tests and type.js to reflect those changes.
 2020-04-02 09:31:35 -04:00
Alex Corey
a867a32b4e Uses formik hooks for JT Form 2020-04-02 09:30:12 -04:00
Shane McDonald
3060505110 Switch from StatefulSet to Deployment 
We can do this now that we dropped RabbitMQ.
 2020-04-02 09:24:49 -04:00
softwarefactory-project-zuul[bot]
b6c272e946 Merge pull request #6525 from ryanpetrello/bye-bye-activity-stream-middleware 
get rid of the activity stream middleware

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-02 05:25:24 +00:00
Ryan Petrello
9fe2211f82 get rid of the activity stream middleware 
it has bugs and is very confusing

see: https://github.com/ansible/tower/issues/4037
 2020-04-01 16:02:42 -04:00
softwarefactory-project-zuul[bot]
e5f293ce52 Merge pull request #6486 from keithjgrant/5909-jt-launch-prompt 
JT Launch Prompting (phase 1)

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-01 18:29:27 +00:00
softwarefactory-project-zuul[bot]
d64b898390 Merge pull request #6491 from john-westcott-iv/second_tower_job_template_update 
Second attempt at converting tower_job_template

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-01 14:09:22 +00:00
softwarefactory-project-zuul[bot]
498c525b34 Merge pull request #6513 from SebastianThorn/devel 
[DOC] Adds comment about needing to be a pem-file

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-01 13:22:03 +00:00
beeankha
bb184f8ffb Update booleans to pass linter 2020-04-01 08:58:28 -04:00
softwarefactory-project-zuul[bot]
7f537dbedf Merge pull request #6515 from ryanpetrello/cleanup-some-more-redis 
remove some unused code from the redis rewrite

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-04-01 12:38:48 +00:00
Ryan Petrello
f9b8a69f7b remove some unused code from the redis rewrite 2020-04-01 08:03:59 -04:00
Sebastian Thörn
bc228b8d77 Adds comment about needing to be a pem-file 
This needs to be a .pem-file
 2020-04-01 11:54:07 +02:00
Keith Grant
7710ad2e57 move OptionsList to components; add launch prompt tests 2020-03-31 13:59:14 -07:00
beeankha
9f2c9b13d7 Update unit test, extra_vars handling, and edit README 2020-03-31 16:16:11 -04:00
softwarefactory-project-zuul[bot]
6940704deb Merge pull request #6509 from ryanpetrello/twisted-cves 
update to the latest twisted to address two open CVEs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-31 19:59:11 +00:00
softwarefactory-project-zuul[bot]
6b9cacb85f Merge pull request #6508 from ryanpetrello/django-extensions-bump 
bump django-extensions version to address a bug in shell_plus

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-31 19:16:49 +00:00
softwarefactory-project-zuul[bot]
cfa0fdaa12 Merge pull request #6337 from rebeccahhh/activity-stream-grab-bag 
add in summary fields to activity stream logging output

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-31 19:15:51 +00:00
Ryan Petrello
4423e6edae update to the latest twisted to address two open CVEs 2020-03-31 13:47:56 -04:00
softwarefactory-project-zuul[bot]
13faa0ed2e Merge pull request #6489 from wenottingham/that-ain't-right 
Don't return different fields for smart vs non-smart inventories

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-31 17:43:03 +00:00
Ryan Petrello
42336355bb bump django-extensions version to address a bug in shell_plus 
see: https://github.com/ansible/awx/pull/6441
see: e8d5daa06e
 2020-03-31 13:39:13 -04:00
softwarefactory-project-zuul[bot]
39460fb3d3 Merge pull request #6505 from squidboylan/tower_group_integration_tests 
Collection: add tower_group child group tests

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-31 17:31:00 +00:00
Keith Grant
4f51c1d2c9 fix LaunchButton tests 2020-03-31 10:09:33 -07:00
Caleb Boylan
04ccff0e3f Collection: add tower_group child group tests 2020-03-31 09:43:53 -07:00
softwarefactory-project-zuul[bot]
2242119182 Merge pull request #6419 from mabashian/5864-schedule-add-2 
Implement schedule add form on JT/WFJT/Proj

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-31 16:06:46 +00:00
mabashian
33a699b8ae Display form errors on new lines if there are multiple 2020-03-31 10:57:30 -04:00
softwarefactory-project-zuul[bot]
344a4bb238 Merge pull request #6494 from ryanpetrello/quiter-pg-migration 
detect event migration tables in a less noisy way

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-31 14:30:15 +00:00
softwarefactory-project-zuul[bot]
0beda08cf9 Merge pull request #6471 from megabreit/jinja2-installer-fix 
support for older jinja2 in installer #5501

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
 2020-03-31 14:10:21 +00:00
softwarefactory-project-zuul[bot]
2264a98c04 Merge pull request #6455 from AlanCoding/auth_errors 
Improve error handling related to authentication

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-31 11:28:37 +00:00
Ryan Petrello
d19a9db523 detect event migration tables in a less noisy way 
see: https://github.com/ansible/awx/issues/6493
 2020-03-31 00:05:30 -04:00
John Westcott IV
4b76332daf Added notification of removal of extra_vars_path 2020-03-30 23:35:11 -04:00
John Westcott IV
db38339179 Second attempt at converting tower_job_template 2020-03-30 23:35:11 -04:00
softwarefactory-project-zuul[bot]
5eddcdd5f5 Merge pull request #6484 from ryanpetrello/inv-source-required 
prevent manual updates at POST /api/v2/inventory_sources/N/update/

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-30 23:46:13 +00:00
softwarefactory-project-zuul[bot]
3480d2da59 Merge pull request #6488 from ryanpetrello/galaxy-role-host-key-checking 
disable host key checking when installing galaxy roles/collections

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-30 22:06:52 +00:00
Keith Grant
e60e6c7d08 pass prompted params through to launch API request 2020-03-30 14:39:16 -07:00
Keith Grant
55356ebb51 set default values on prompts 2020-03-30 14:37:07 -07:00
Keith Grant
7f4bbbe5c5 add launch prompt inventory step 2020-03-30 14:37:07 -07:00
Keith Grant
49b1ce6e8c add skeleton of launch prompt wizard 2020-03-30 14:37:07 -07:00
Bill Nottingham
96576b0e3d Don't return different fields for smart vs non-smart inventories 2020-03-30 17:15:55 -04:00
mabashian
288ce123ca Adds resources_needed_to_start to the list of keys for error message handling 2020-03-30 17:04:17 -04:00
Ryan Petrello
140dbbaa7d disable host key checking when installing galaxy roles/collections 
see: https://github.com/ansible/awx/issues/5947
 2020-03-30 17:03:14 -04:00
softwarefactory-project-zuul[bot]
e9d11be680 Merge pull request #6104 from mabashian/6086-proj-form-org 
Fixes issues with organization when saving the project form.

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-30 20:47:12 +00:00
softwarefactory-project-zuul[bot]
d7f117e83f Merge pull request #6448 from AlexSCorey/6446-HostAdd 
Fixes HostAdd Form layout issue

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-03-30 20:47:08 +00:00