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

28027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth Foster
0e5f68ef53
Make all_parents_must_converge settable when creating node 
When targeting, ../workflow_job_templates/id#/workflow_nodes/ endpoint,
user could not set all_parents_must_converge to true.

3.7.1 backport for awx issue #7063
 2020-06-09 11:07:22 -04:00
softwarefactory-project-zuul[bot]
81d388d137
Merge pull request #7283 from fosterseth/fix-parents_converge_settable_api 
Make all_parents_must_converge settable when creating node

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-09 15:03:53 +00:00
Ryan Petrello
a057a2e056
Merge pull request #4394 from ryanpetrello/mattermost-371 
Send content-type with mattermost notifications, fixes #7264
 2020-06-09 10:35:55 -04:00
Florian Apolloner
e9e410f4f8
Send content-type with mattermost notifications, fixes #7264 2020-06-09 10:32:32 -04:00
Rebeccah
60800d6740
add license file for django-redis 2020-06-09 10:24:23 -04:00
Rebeccah
02cf4585f8
remove memcache license file 2020-06-09 10:24:23 -04:00
Rebeccah
669d4535b1
adding isolate db location and ingore for django_redis exceptions 2020-06-09 10:24:23 -04:00
Rebeccah Hunter
b09d9cbe41
removed django-redis as a dependency 
Co-authored-by: Shane McDonald <me@shanemcd.com>
 2020-06-09 10:24:23 -04:00
Rebeccah
d2bbe7aa1a
remove memcache from everywhere and add djagno-redis to cover it 2020-06-09 10:24:23 -04:00
Ryan Petrello
71cc359ccf don't block on log aggregator socket.send() calls 
see: https://github.com/ansible/tower/issues/4391
 2020-06-09 10:10:32 -04:00
Sean Sullivan
104073af45
Merge pull request #1 from ansible/devel 
Merging remote to devel
 2020-06-09 07:50:36 -05:00
softwarefactory-project-zuul[bot]
246aee623b
Merge pull request #7293 from AlanCoding/lint_failure 
fix lint failures

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-09 03:12:02 +00:00
softwarefactory-project-zuul[bot]
6b3ec46fe8
Merge pull request #7291 from mabashian/ui-websocket-extensions 
Manually bumps websocket-extensions to 0.1.14 (awx/ui)

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-09 01:07:47 +00:00
Chris Meyers
37c1c33ecd
Merge pull request #4389 from chrismeyersfsu/fix-run_wsbroadcast_status_3_7_1 
awx-manage run_wsbroadcast --status doesn't work in openshift
 2020-06-08 20:18:32 -04:00
AlanCoding
9dec359898
fix lint failures 2020-06-08 20:11:11 -04:00
softwarefactory-project-zuul[bot]
222998281f
Merge pull request #7292 from ryanpetrello/sock-it-to-me 
don't block on log aggregator socket.send() calls

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-08 22:34:53 +00:00
Ryan Petrello
7164049062
don't block on log aggregator socket.send() calls 
see: https://github.com/ansible/tower/issues/4391
 2020-06-08 18:07:33 -04:00
Seth Foster
e768d5e7fc
Make all_parents_must_converge settable when creating node 
When targeting, ../workflow_job_templates/id#/workflow_nodes/ endpoint,
user could not set all_parents_must_converge to true.

awx issue #7063
 2020-06-08 17:51:15 -04:00
softwarefactory-project-zuul[bot]
e5ec761434
Merge pull request #7270 from john-westcott-iv/fix_tower_settings_none 
Prevent exception for Non value

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-08 21:05:58 +00:00
chris meyers
2f7ba75ae4 track stats by hostname not remote host/ip 
* broadcast websockets have stats tracked (i.e. connection status,
number of messages total, messages per minute, etc). Previous to this
change, stats were tracked by ip address, if it was defined on the
instance, XOR hostname. This changeset tracks stats by hostname.
 2020-06-08 16:35:17 -04:00
chris meyers
9c20b9412a delete and re-add host when ip address changes 
* The websocket backplane interconnect is done via ip address for
Kubernetes and OpenShift. On init run_wsbroadcast reads all Instances
from the DB and makes a decision to use the ip address or the hostname
based, with preference given to the ip address if defined. For
Kubernetes and OpenShift the nodes can load the Instance before the
ip_address is set. This would cause the connection to be tried by
hostname rather than ip address. This changeset ensures that an ip
address set after an Instance record is created will be detected and
used.
 2020-06-08 16:34:51 -04:00
softwarefactory-project-zuul[bot]
40b020c370
Merge pull request #7284 from AlexSCorey/7232-ApplicationsRouteStub 
Adds routing stubs for Applications

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-08 20:13:52 +00:00
softwarefactory-project-zuul[bot]
2a566f575f
Merge pull request #7290 from mabashian/ui-next-websocket-extensions 
Manually bumps websocket-extensions to 0.1.14 (awx/ui_next)

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-08 19:54:16 +00:00
Alex Corey
2784409c46 Fixes folder name 2020-06-08 15:34:25 -04:00
softwarefactory-project-zuul[bot]
946a86f350
Merge pull request #6780 from tchellomello/rfe_saml_mapping_2688 
Adds SAML Attribute Mapping to Teams and Orgs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-08 18:58:23 +00:00
mabashian
57a6c8d693 Manually bumps websocket-extensions to 0.1.14 in awx/ui 2020-06-08 14:29:52 -04:00
mabashian
142c0da9f0 Manually bumps websocket-extensions to 0.1.14 2020-06-08 14:14:59 -04:00
Ryan Petrello
99c0a954e4
Merge pull request #4384 from ryanpetrello/rsyslog-chmod 
properly write rsyslog configuration as 0640
 2020-06-08 14:05:18 -04:00
softwarefactory-project-zuul[bot]
28baa8b24b
Merge pull request #7280 from apollo13/patch-1 
Send content-type with mattermost notifications, fixes #7264

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
 2020-06-08 17:27:05 +00:00
Marcelo Moreira de Mello
3f8bc0d7c8 Adds SAML Attribute Mapping to Teams and Orgs 
Signed-off-by: Marcelo Moreira de Mello <tchello.mello@gmail.com>
 2020-06-08 12:40:33 -04:00
Alex Corey
0df4047d3d Adds routing stubs for Applications 2020-06-08 11:55:21 -04:00
softwarefactory-project-zuul[bot]
feb9c5700c
Merge pull request #7257 from jbradberry/fix-deadlock 
Force worker processes to have a different signal handler from the parent

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-08 15:34:25 +00:00
Florian Apolloner
cf6235f6ea
Send content-type with mattermost notifications, fixes #7264 2020-06-08 16:30:52 +02:00
beeankha
b457c8f133 Update a task in tower_settings integration test playbook 2020-06-08 09:57:16 -04:00
softwarefactory-project-zuul[bot]
824d798d81
Merge pull request #7116 from john-westcott-iv/token_modules 
Initial cut at tower_token module

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-08 12:26:43 +00:00
John Westcott IV
76dcd6d72a Fixing scooby doo fingers 2020-06-08 07:49:58 -04:00
John Westcott IV
64846c3347 Fixing truthy issues 2020-06-08 07:09:45 -04:00
John Westcott IV
95b8bd63ea Fixing linting issues 2020-06-08 07:06:45 -04:00
John Westcott IV
3b60529488 Fixes in testing and parameter processing 2020-06-08 06:42:33 -04:00
softwarefactory-project-zuul[bot]
7a59922f0f
Merge pull request #7245 from sean-m-sullivan/organization_job_template 
tower_job_template to use organizations

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-08 02:12:00 +00:00
sean-m-sullivan
360352b78e updated version 2020-06-06 20:12:47 -05:00
sean-m-sullivan
21abf5a788 updated to remove version and add docs 2020-06-06 20:11:46 -05:00
softwarefactory-project-zuul[bot]
62dbb6bfdb
Merge pull request #7261 from shanemcd/auto-qs 
Add queue / instance group registration to heartbeat for k8s installs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-06 13:32:08 +00:00
Shane McDonald
460f31a05d
Fix up test that was only failing in dev env 
I'm not sure how this one slipped by. The default config is built into the
image, but we were bind-mounting an empty directory on top of it.
 2020-06-06 08:58:43 -04:00
Shane McDonald
91dbc2de30
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-06 08:58:35 -04:00
softwarefactory-project-zuul[bot]
e603cfd7ab
Merge pull request #7239 from AlexSCorey/6863-CopyProjectsAndInventories 
Adds ux for unsynced projects

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-05 23:59:33 +00:00
Jim Ladd
0a0735344e
Merge pull request #4342 from jladdjr/foreman_group_prefix_should_apply_to_all_groups_3.7.1 
foreman: use group_prefix for all groups (release_3.7.1)
 2020-06-05 15:25:22 -07:00
mo-saeed
0bfcacfcf4
Merge branch 'devel' into devel 2020-06-06 00:19:19 +02:00
mosad
1e6437b773 Resolve conflict 2 2020-06-06 00:17:26 +02:00
softwarefactory-project-zuul[bot]
3cdeb48d3f
Merge pull request #7271 from jladdjr/bump_foreman_collection_0.8.1 
Bump foreman collection to 0.8.1

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-05 22:04:23 +00:00