1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 22:21:13 +03:00
Commit Graph

12729 Commits

Author SHA1 Message Date
Bill Nottingham
6b88643517 Get /api/ instead of /api.
Hitting /api gives a 301 redirection to /api/, might as well just go there out of the box.
2017-05-18 12:30:28 -04:00
Wayne Witzel III
7c2e5df659 Merge pull request #6282 from wwitzel3/smart-inventory
Dynamic -> Smart Inventory
2017-05-17 16:36:51 -04:00
Wayne Witzel III
d652ed16d0 Dynamic -> Smart Inventory 2017-05-17 16:25:40 -04:00
Matthew Jones
a539a820a7 Updating celery autoscale and prefetch behavior
* Increase total number of celery jobs to match what we are currently
  supporting in production with very large instances
* Make sure celery in the development environment also uses fair
  scheduling without prefetching
2017-05-17 14:33:22 -04:00
Chris Meyers
8cf8e6c0c0 Merge pull request #6276 from chrismeyersfsu/improve-task_manager_performance_prefetch
prefetch optimizations for task manager
2017-05-16 21:19:47 -04:00
Michael Abashian
1627cb830c Merge pull request #6278 from mabashian/host-add-fix
Fixed host add form
2017-05-16 16:41:57 -04:00
Michael Abashian
85ed1ce0be Fixed host add form 2017-05-16 16:30:20 -04:00
Chris Meyers
047bcd92fe Merge pull request #6274 from chrismeyersfsu/fix-scheduler_update_on_launch
only consider update_on_launch inventory sources
2017-05-16 15:08:37 -04:00
Chris Meyers
067fdac8b1 prefetch optimizations for task manager
* Prefetch all Jobs Types related instance group
* Prefetch inventory updates inventory source. The attribute
inventory_source.inventory_id is accessed when building the hash
tables of the running tasks.
2017-05-16 15:05:20 -04:00
Alan Rominger
430852b73d Merge pull request #6271 from AlanCoding/wfj_no_node
Remove `execution_node` from WFJ serializer
2017-05-16 14:44:50 -04:00
Chris Meyers
9b771ae907 only consider update_on_launch inventory sources
* When generating dependencies (i.e. dynamically launching Project
Update and Inventory Update) only create the dynamic dependencies if
update_on_launch is True.
2017-05-16 13:18:15 -04:00
AlanCoding
2cbb2c6d53 remove execution_node from WFJ serializer 2017-05-16 12:31:29 -04:00
Chris Meyers
d7b07f1f1f Merge pull request #6273 from chrismeyersfsu/fix-read_error
fix 50x error from nginx
2017-05-16 12:10:56 -04:00
Matthew Jones
575a7dd165 Use proper print syntax for Makefile in-line python statements 2017-05-16 10:58:28 -04:00
Chris Meyers
27c32de4a2 Merge pull request #6242 from chrismeyersfsu/implement-6203
associate insights machine id w/ host on fact scan
2017-05-16 10:27:45 -04:00
Michael Abashian
7fd406eaad Merge branch 'mabashian-inventory-source-states' into devel 2017-05-16 08:37:24 -04:00
Michael Abashian
4648c5619e Merge branch 'inventory-source-states' of https://github.com/mabashian/ansible-tower into mabashian-inventory-source-states
# Conflicts:
#	awx/ui/client/src/inventories/main.js
2017-05-16 08:37:09 -04:00
Michael Abashian
984f863dac Merge branch 'mabashian-inventory-codemirrors' into devel 2017-05-16 08:32:03 -04:00
Michael Abashian
786fa89db6 Merge branch 'inventory-codemirrors' of https://github.com/mabashian/ansible-tower into mabashian-inventory-codemirrors
# Conflicts:
#	awx/ui/client/src/inventories/hosts/host.form.js
2017-05-16 08:31:45 -04:00
Michael Abashian
ee0ac72c89 Merge pull request #6261 from mabashian/inventory-bug-fixes
Fixed inventory limit panels bug, breadcrumb and redirect bugs
2017-05-16 08:27:10 -04:00
Michael Abashian
e0a25b08e9 Merge pull request #6250 from mabashian/hosts-edit-groups
Fixed host list related groups tab.
2017-05-16 08:24:59 -04:00
Michael Abashian
8f7a489c30 Merge pull request #6229 from mabashian/adhoc-related
Fixed adhoc limit pattern when navigating from nested group to adhoc form
2017-05-16 08:23:25 -04:00
Michael Abashian
d304347312 Merge pull request #6162 from cchurch/fix_license_expires_on
Fix license expires on date
2017-05-16 08:22:27 -04:00
Matthew Jones
88706a7d6c Merge pull request #6267 from ansible/instance_group_ui_extra_fields
Adding more informative fields to HA model views
2017-05-16 02:24:57 +00:00
Alan Rominger
22249b2625 Merge pull request #6266 from AlanCoding/ig_ordering
Instance group preference order consistent with docs
2017-05-15 16:34:18 -04:00
Alan Rominger
422ff33f5a Merge pull request #6260 from AlanCoding/IG_meeting_words
Add docs from Instance Groups acceptance meeting
2017-05-15 16:33:22 -04:00
Michael Abashian
46c19c26aa Added inv source add/edit cred and inv script lookup states 2017-05-15 16:14:38 -04:00
Matthew Jones
f96324aad8 Adding more informative fields to HA model views
Requested by the UI team to drive an Instances/InstanceGroup display
2017-05-15 15:47:48 -04:00
AlanCoding
fbf24492d8 Instance group preference order consistent with docs 2017-05-15 15:45:10 -04:00
Alan Rominger
537e046815 Merge pull request #6265 from AlanCoding/IU_dep_type
dependent IU launch_type reduced to 'dependency'
2017-05-15 14:37:15 -04:00
Alan Rominger
4d33197598 Merge pull request #6263 from AlanCoding/ret_TG
Return template_groups when set on UJT
2017-05-15 14:36:57 -04:00
AlanCoding
901c77bcfb dependent IU launch_type reduced to 'dependency' 2017-05-15 14:24:41 -04:00
AlanCoding
05cecbf0e6 Return template_groups when set on UJT 2017-05-15 13:12:21 -04:00
Matthew Jones
fc6630fd25 Consider that the project could be none when launching dependencies 2017-05-15 12:33:36 -04:00
Wayne Witzel III
8b0735a910 Merge pull request #6240 from wwitzel3/issue-6233
Add test to verify no duplicate results in DynamicFilter
2017-05-15 12:31:25 -04:00
Wayne Witzel III
477956ec30 Add distinct to HostManager for DynamicFilter results 2017-05-15 12:20:17 -04:00
Wayne Witzel III
b2b15043c9 Test that the DynamicFilter does not return duplicates. 2017-05-15 12:10:57 -04:00
Shane McDonald
066d2e87e3 Fix DEB builds
I was upgrading virtualenv for good measure in 4545fc1da1488bb1623de82ad19f78702bd6df62, but didnt foresee it causing problems. I was wrong. Worked for everything except Trusty builds.
2017-05-15 11:02:04 -04:00
Shane McDonald
81d10dd7f3 Add awx/ui/client/languages/ to ui-clean target
These json files are generated at build time.
2017-05-15 11:01:07 -04:00
AlanCoding
b41f4de4e5 Add docs from Instance Groups acceptance meeting 2017-05-15 10:16:47 -04:00
Michael Abashian
86d3d9466a Fixed limit panels bug, breadcrumb and redirect bugs 2017-05-15 10:13:31 -04:00
Wayne Witzel III
b9520c7f3b Merge pull request #6246 from wwitzel3/issue-5756
Create /inventories/N/update_inventory_sources endpoint.
2017-05-12 17:30:00 -04:00
Alan Rominger
5f3aad4972 Merge pull request #6256 from AlanCoding/relaunch_extra_creds
Job relaunch refactor to accommodate new credential system
2017-05-12 17:24:16 -04:00
Alan Rominger
d22618aa09 Merge pull request #6247 from AlanCoding/extra_credit
JT RBAC edits for extra_credentials and vault_credential
2017-05-12 17:23:26 -04:00
AlanCoding
048804f48e Job relaunch refactor to accomidate new credential system
* make user_capability for 'start' more simple
* provide error messages if relaunch not possible
* check for prompted extra_credentials
* add extra_credentials permission checks in orphan mode
2017-05-12 17:16:06 -04:00
AlanCoding
c6a3a7cc34 JT RBAC edits for extra_credentials and vault_credential 2017-05-12 17:13:58 -04:00
Ryan Petrello
5b86fc299f Merge pull request #6257 from ryanpetrello/shaaaaaaaaaaaame
fix a typo causing tests to fail
2017-05-12 16:51:05 -04:00
Ryan Petrello
7c3b189eff Merge pull request #6252 from ryanpetrello/ssh_credential_refactor
refactor and fix ssh_private_key and ssh_key_unlock validation
2017-05-12 16:48:51 -04:00
Matthew Jones
b7622a6ed9 Remove test_partial 2017-05-12 16:46:55 -04:00
Ryan Petrello
e3842cfb50 Merge pull request #6254 from ryanpetrello/devel
squash together a few credential-related migrations
2017-05-12 16:44:06 -04:00