shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity
20,192 Commits 40 Branches 19 Tags 380 MiB
bed63b3690
Commit Graph

20192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot]
6384e638f5
Merge pull request #3340 from AlexSCorey/3297-smartInventoryLabel 
Add padding to label list tag.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-03-01 16:20:09 +00:00
Alex Corey
1df5e55a4e add padding to label list tag. 2019-03-01 10:56:08 -05:00
softwarefactory-project-zuul[bot]
d1005f91e7
Merge pull request #3174 from jbradberry/org_hosts_limit 
[WIP] Org hosts limit

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-28 21:27:50 +00:00
softwarefactory-project-zuul[bot]
d9451ac12c
Merge pull request #3335 from AlexSCorey/3309-mgmtJobTitleStyling 
Add margin to Management Jobs Notifications list

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-28 21:12:59 +00:00
mabashian
a82304765d Adds help text to host limit error shown in the output details of inventory sync jobs 2019-02-28 15:54:10 -05:00
mabashian
cc3f2e0819 Properly pass path to error message 2019-02-28 15:54:10 -05:00
mabashian
03c07c0843 Adds error handling to launch api calls 2019-02-28 15:54:10 -05:00
mabashian
1b94b616f0 Default empty max hosts to 0 2019-02-28 15:54:09 -05:00
mabashian
98c5cb1c4c Adds max value to host limit input 2019-02-28 15:54:09 -05:00
mabashian
ce5a85a53b Add support for max hosts on org 2019-02-28 15:54:09 -05:00
Jeff Bradberry
046385d72e Make the inventory_import command log an error message on exception 
when it happens in the big try/except block in the middle of handle().
Previously it wasn't doing anything with it, except exiting with a
code of 1.
 2019-02-28 15:54:09 -05:00
Jeff Bradberry
7eba55fbde Change the wording of the error when adding a host 
to "Organization host limit of %s would be exceeded...", since the
host will probably not actually be made active.
 2019-02-28 15:54:09 -05:00
Jeff Bradberry
6ac51b7b13 Update the permission error to include max_hosts and the current host count 2019-02-28 15:54:09 -05:00
Jeff Bradberry
97cc467ae1 Restrict edit permissions on the Organization.max_hosts field to superusers 2019-02-28 15:54:09 -05:00
Jeff Bradberry
3312ebcb05 Remove the hosts count from related_field_counts in the org api endpoints 
It is probably not needed, and adds an additional db query.
 2019-02-28 15:54:09 -05:00
Jeff Bradberry
4d06ae48d3 Deal with the (erroneous) case where a job is missing the inventory 
by bailing out of check_org_host_limit early.  Validation catches this
situation later on.
 2019-02-28 15:54:09 -05:00
Jeff Bradberry
cf75ea91a1 Properly use the inventory in the can_start permissions checks 2019-02-28 15:54:09 -05:00
Jeff Bradberry
5e34f6582b Tests for start permissions for JobTemplate and WorkflowJob 
when max_hosts is set.
 2019-02-28 15:54:09 -05:00
Jeff Bradberry
60008dbd74 Add a test that AWX doesn't care about max_hosts when editing hosts 
on an inventory.
 2019-02-28 15:54:09 -05:00
Jeff Bradberry
4afd0672a1 Add test that AWX doesn't care about the limit when creating new hosts 2019-02-28 15:54:09 -05:00
Jeff Bradberry
875a1c0b5f Remove the mention of the max_hosts value from the limit check messages 2019-02-28 15:54:09 -05:00
Jeff Bradberry
f5d7ca6913 Update the Organization API list and detail tests to check the host counts 2019-02-28 15:54:09 -05:00
Jeff Bradberry
df8a66e504 Correct the org limit check for changing hosts to use the host's org 
instead of an inventory passed in from the user data, which is not allowed.
 2019-02-28 15:54:09 -05:00
Jeff Bradberry
43a0a15f6f Expose the new InventoryUpdate.org_host_limit_error field in the API 2019-02-28 15:54:09 -05:00
Jeff Bradberry
36ed890c14 Add permissions checks for the organization host limit 2019-02-28 15:54:09 -05:00
Jeff Bradberry
0e8e5f65e1 Update to fix tests 2019-02-28 15:54:09 -05:00
Jeff Bradberry
6399ec59c9 Include in the API the count of hosts used by an organization 2019-02-28 15:54:09 -05:00
Jeff Bradberry
e44c73883e Expose Organization.max_hosts in the API 2019-02-28 15:54:09 -05:00
Jeff Bradberry
c3406748de Add the new fields to the database 2019-02-28 15:54:03 -05:00
Jeff Bradberry
6d70651611 Update the inventory_import management command 
to respect the new Organization.max_hosts limit.
 2019-02-28 15:51:50 -05:00
Jeff Bradberry
5e13da62a4 Added a max_hosts field to Organization 
in order to optionally set a limit to the number of hosts an
organization that is sharing a license is allowed to manage.

related #1542
 2019-02-28 15:51:50 -05:00
softwarefactory-project-zuul[bot]
658e5f0fc8
Merge pull request #3272 from jladdjr/mo_stats 
Add support for new playbook stats

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-28 18:24:03 +00:00
softwarefactory-project-zuul[bot]
cebd918e49
Merge pull request #3331 from mabashian/IG-instances-modal 
Fixes bug where all instances were preselected when modal was initially opened

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-28 14:30:43 +00:00
Alex Corey
a8c4e92804 Add margin to Management Jobs Notifications list 2019-02-28 09:17:27 -05:00
softwarefactory-project-zuul[bot]
dea71d2682
Merge pull request #3333 from ryanpetrello/more-py3-bugs 
fix a few additional py3 issues

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-28 13:31:05 +00:00
Markus Opahle
ed568f569c only use ssl if certificate is specified 
Signed-off-by: Markus Opahle <3225748+mopahle@users.noreply.github.com>
 2019-02-28 14:06:59 +01:00
Ryan Petrello
13c05c68fc
fix a few additional py3 issues 
related: https://github.com/ansible/awx/issues/3329
 2019-02-27 16:56:36 -05:00
mabashian
2be7f853f3 Fixes bug where all instances were preselected when modal was initially opened 2019-02-27 15:24:29 -05:00
softwarefactory-project-zuul[bot]
3b5681465a
Merge pull request #3308 from AlexSCorey/3283-BorderIssues 
Removes top left border radius on lists

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-27 16:55:01 +00:00
softwarefactory-project-zuul[bot]
a6c7502217
Merge pull request #3294 from ansible/form-error-handling 
Tests for form validation and error checks

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-27 15:58:39 +00:00
softwarefactory-project-zuul[bot]
50a87843ee
Merge pull request #3315 from mabashian/elapsed-timer 
Show elapsed timer while job is running

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-27 15:54:20 +00:00
Daniel Sami
238b6cbb61 E2E tests for form validation 2019-02-27 10:33:09 -05:00
walkafwalka
3a7bf6a8ac Add SSL suport for docker install 
Signed-off-by: walkafwalka <41709139+walkafwalka@users.noreply.github.com>
 2019-02-27 10:45:34 +01:00
mabashian
6e64aa81fd Always show elapsed timer regardless of running state 2019-02-26 11:38:46 -05:00
Alex Corey
445612315b Removes top left border radius on list item where the list has a tool bar 
Removes redundant styling.
 2019-02-26 09:52:07 -05:00
softwarefactory-project-zuul[bot]
bb276a8fcb
Merge pull request #3260 from jlmitch5/launchJTWFForm 
add launch button to jt and wf forms

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-02-25 17:52:01 +00:00
Jim Ladd
b7b0bdaeca Ansible 2.8 deprecates use of -U 2019-02-25 00:42:19 -08:00
Jim Ladd
cc1a97b6d8 Update JobHostSummary.__str__ and corresponding tests 2019-02-25 00:42:19 -08:00
Jim Ladd
c6227797b4 Make new host summary fields backwards compatible 2019-02-22 14:07:07 -08:00
Chris Meyers
b383144b69
Merge pull request #3293 from chrismeyersfsu/fix-serial 
fix handling of serial strategy
 2019-02-22 13:30:24 -05:00