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

27492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Bradberry
0fda9d2c56 Continue after failures to grant roles 2020-06-11 13:19:24 -04:00
Jim Ladd
43ab6acb84 revert EC2_INSTANCE_ID_VAR 2020-06-11 09:53:50 -07:00
Jim Ladd
8eee0d40dd revert EC2_INSTANCE_ID_VAR 2020-06-11 09:52:54 -07:00
Ryan Petrello
fe221c2473
Merge pull request #4399 from shanemcd/kube-queues 
Add queue / instance group registration to heartbeat for k8s installs
 2020-06-11 09:00:16 -04:00
softwarefactory-project-zuul[bot]
cb1a3e4199
Merge pull request #7312 from nixocio/ui_issue_7301 
Add stub files for Credential Types

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-10 21:24:17 +00:00
Jim Ladd
3b61b82616 wrap --instance-id-var in quotes 2020-06-10 14:06:57 -07:00
Jim Ladd
9eaee801a7 update VMWARE_INSTANCE_ID_VAR 
* Favor instanceUuid
* .. but fall back to instanceuuid if necessary
 2020-06-10 14:06:54 -07:00
AlanCoding
1970fac989 Allow use of fallback instance_ids 2020-06-10 14:06:50 -07:00
softwarefactory-project-zuul[bot]
28164ad4cc
Merge pull request #7319 from wenottingham/unused-perhaps 
Remove active_counts_by_org

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-10 21:05:50 +00:00
Jim Ladd
9514adaf3a wrap --instance-id-var in quotes 2020-06-10 13:55:54 -07:00
Shane McDonald
85deb8711c
Add queue / instance group registration to heartbeat for k8s installs 
There is some history here.

https://github.com/ansible/awx/pull/7190 <- This PR was an attempt at fixing a
bug notting ran into where some jobs on k8s installs would get stuck in Waiting
forever.

The PR mentioned above introduced a bug where there are no instance groups on a
fresh k8s-based install. This is because this process currently happens in the
launch scripts, before the database is up.

With this patch, queue / instance group registration happens in the heartbeat,
right after auto-registering the instance.
 2020-06-10 16:55:27 -04:00
nixocio
8eecfeaab4 Add stub files for Credential Types 
Add stub files for Credential Types. Routing system, and screens layout.

closes: https://github.com/ansible/awx/issues/7301
 2020-06-10 16:44:10 -04:00
Jim Ladd
17eaeb28a8 update VMWARE_INSTANCE_ID_VAR 
* Favor instanceUuid
* .. but fall back to instanceuuid if necessary
 2020-06-10 13:30:05 -07:00
Jeff Bradberry
bf6e8f8e83 Prioritize membership roles 
since certain role grants will not be accepted by the api unless the user or team is part of the correct organization.
 2020-06-10 15:27:15 -04:00
Bill Nottingham
a33c303765 Remove active_counts_by_org 
I was trying to parse the difference between this and the
(directly above) org_active_count from the comment, and then I
grepped and realized this function appears unused.
 2020-06-10 15:25:14 -04:00
Shane McDonald
423df6618d
Force containers in k8s to run under root group 
Normally containers belong to the 'root' group, but for some reason the
downstream red hat scl redis image only belongs to the 'redis' group by default. This fixes that.
 2020-06-10 13:40:15 -04:00
softwarefactory-project-zuul[bot]
3ae4417af4
Merge pull request #7314 from nixocio/ui_fix_clipboard_error 
Add required variables to ClipboardCopyButton test

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-10 16:43:28 +00:00
softwarefactory-project-zuul[bot]
2582036fc8
Merge pull request #7313 from kdelee/update_k8s_inv_docs 
remove some references to memcached

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-10 16:33:08 +00:00
softwarefactory-project-zuul[bot]
b8e1f1b882
Merge pull request #7316 from ryanpetrello/tmi 
remove a highly verbose log lines

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-10 16:23:30 +00:00
softwarefactory-project-zuul[bot]
dc3701b3d6
Merge pull request #7315 from ryanpetrello/redis-chmod-docker 
set proper permissions for the redis socket

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-10 16:06:25 +00:00
softwarefactory-project-zuul[bot]
3818fb9b69
Merge pull request #7306 from AlexSCorey/6863-CopyProjectsAndInventories 
Removes extra spacing from timeOfDay function

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-10 16:06:20 +00:00
Ryan Petrello
64ebfa75a8
remove a highly verbose log lines 2020-06-10 11:50:13 -04:00
Ryan Petrello
e81ccf10df
set proper permissions for the redis socket 2020-06-10 11:36:09 -04:00
nixocio
9797c8e3c2 Add required variables to ClipboardCopyButton test 
Add required variables to `ClipboardCopyButton` test to remove warnings
during test execution.
 2020-06-10 11:25:39 -04:00
Elijah DeLee
a83a9c9723 remove dep on python-memcached 2020-06-10 11:18:48 -04:00
Elijah DeLee
6777b82d8e remove reference to memcached in k8s inv 
we don't have memcached container anymore
 2020-06-10 11:08:49 -04:00
softwarefactory-project-zuul[bot]
753b8c287c
Merge pull request #7221 from AlexSCorey/6589-InventorySourceSchedules 
Adds Inventory Sources Schedules

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-10 15:01:54 +00:00
mosad
eb5970b4a1 merge and resolve conflicts 2020-06-10 16:01:17 +02:00
Ryan Petrello
7c1959010a
Merge pull request #4396 from jladdjr/foreman_script_should_not_use_reports_3.7.1 
disable reports option for foreman (release_3.7.1)
 2020-06-10 08:30:14 -04:00
AlanCoding
1dd9772e41 Allow use of fallback instance_ids 2020-06-09 22:51:42 -07:00
Jim Ladd
18d09f892d disable reports option for foreman 2020-06-09 22:37:35 -07:00
Jake McDermott
ee6f03515e
Merge pull request #4340 from jakemcdermott/fix-4336 
[3.7.1] Enable management job notications for admins
 2020-06-09 16:27:07 -04:00
Jake McDermott
16f81154c0
Merge pull request #4338 from mabashian/4334-backport-v2 
[3.7.1] Fixes bug where all_parents_must_converge was not being set for new or existing approval nodes
 2020-06-09 15:36:40 -04:00
Jeff Bradberry
19b7c91486 Return the changed status of imports 2020-06-09 15:00:06 -04:00
Jeff Bradberry
aeeed4d371 Add more logging 2020-06-09 15:00:06 -04:00
Jeff Bradberry
1f7c1af64e Fix WFJT nodes endpoint to return node pages when posting 
not the node list page.
 2020-06-09 15:00:06 -04:00
Jeff Bradberry
65fc2db42f Recursively queue up related assets to be created and/or assigned 2020-06-09 14:59:49 -04:00
Alex Corey
82010e4ba2 removes extra spacing 2020-06-09 14:59:36 -04:00
Ryan Petrello
1d7e2a82c6
Merge pull request #4393 from kdelee/backport_dont_block_log_send 
[3.7.1] don't block on log aggregator socket.send() calls
 2020-06-09 14:49:43 -04:00
softwarefactory-project-zuul[bot]
442d539ff8
Merge pull request #7176 from nixocio/ui_issue_5819 
Add support Prompt on Launch for Workflow Job Template

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
12.0.0 		2020-06-09 18:37:59 +00:00
Jeff Bradberry
c8288af87f Make sure we have a cached version of existing objects 
even if it isn't an object being directly imported.  We might need it
for relations of things that are being imported.
 2020-06-09 13:54:05 -04:00
Jeff Bradberry
76fb605dcd Deal with exports involving foreign keys where you don't have permission 2020-06-09 13:54:05 -04:00
Jeff Bradberry
a531b85b31 Redo waiting until Project updates are complete 2020-06-09 13:54:05 -04:00
Jeff Bradberry
86afa5cf42 Make more use of the PageCache for imports 2020-06-09 13:54:05 -04:00
Jeff Bradberry
57aff6394c Log an error and continue when a related object is not found 2020-06-09 13:54:05 -04:00
Jeff Bradberry
66bc947adb Reuse _import_list for import of related full objects 
e.g. WFJT Nodes.  Also rename _import_list from _create_assets.
 2020-06-09 13:54:05 -04:00
Jeff Bradberry
301f15bfdd Rename some things for consistency 2020-06-09 13:54:05 -04:00
Jeff Bradberry
9fc1a4bb44 Change the method that exports list views to take a PageList or TentativePage 
This will allow the related m2m views to also use this method, with a
bit of effort.  Also, remove the use of pk_or_name in favor of a new
method that reduces the number of api calls.
 2020-06-09 13:54:05 -04:00
Jeff Bradberry
f7825aefeb Avoid doing an OPTIONS call unless we know it is a related type we export 2020-06-09 13:54:05 -04:00
Jeff Bradberry
14b5f63bd8 Use the new PageCache to store and reuse Page.get results 2020-06-09 13:54:05 -04:00