External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 21:51:26 -03:30
Code Issues Packages Projects Releases Wiki Activity
28,002 Commits 55 Branches 19 Tags
Commit Graph

28002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Bradberry
f53920d3bf Begin changing Import to work with the structure created by Export 2020-06-09 13:54:04 -04:00
Jeff Bradberry
372570ce8e Extract out get_natural_key as a standalone function 2020-06-09 13:54:04 -04:00
Jeff Bradberry
6f28361bf5 Make serialize_asset use Pages to a greater extent 2020-06-09 13:54:04 -04:00
Jeff Bradberry
0877e5305c Modify get_natural_key to work on Pages 2020-06-09 13:54:04 -04:00
Jeff Bradberry
e4383c505f Make more use of the functionality of Page in get_assets 
and related methods.  Also, rename get_resource_options -> get_options
and enhance_asset -> serialize_asset.
 2020-06-09 13:54:04 -04:00
Jeff Bradberry
fb066eb52e Fold the other methods doing API calls into get_assets() 2020-06-09 13:54:04 -04:00
Jeff Bradberry
6162ff0439 Start to record the role membership 
but not really, since it still isn't fully capturing the role content_object
 2020-06-09 13:54:04 -04:00
Jeff Bradberry
dfe34563aa Resolve the natural keys of assets we've already collected 2020-06-09 13:54:04 -04:00
Jeff Bradberry
37cbf7691b Split out separate methods for the OPTIONS call and massaging each asset dict 2020-06-09 13:54:04 -04:00
Jeff Bradberry
9280198b0f Use a list of exportable resources to build up the parser 
Also, handle an implicit export of everything.
 2020-06-09 13:54:04 -04:00
Jeff Bradberry
2127f3c96d Add organizations as a resource type to export 2020-06-09 13:54:04 -04:00
Jeff Bradberry
9f7fecf8da Add basic import command 2020-06-09 13:54:04 -04:00
Jeff Bradberry
c1a07ff00b Limit export output to only those fields needed to create the resource 2020-06-09 13:54:04 -04:00
Jeff Bradberry
f21d6b1fc4 Actually query the API for the user or users requested 2020-06-09 13:54:04 -04:00
Jeff Bradberry
4312395a3a Normalize the requested resource into a pk 
using the pk_or_name helper function.  Also, authenticate to the API.
 2020-06-09 13:54:04 -04:00
Jeff Bradberry
c1f6fec532 Add skeleton of a custom 'export' resource 
This only takes a flag for users at the moment, and does nothing in
particular with it.
 2020-06-09 13:54:04 -04:00
softwarefactory-project-zuul[bot]
3952946d9c
Merge pull request #7296 from shanemcd/twelve-dot-o-dot-o 
Bump version to 12.0.0

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-09 17:06:36 +00:00
softwarefactory-project-zuul[bot]
3fa34dad04
Merge pull request #7302 from ryanpetrello/redis-no-tcp 
remove TCP ports for redis (it only listens on a unix domain socket)

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-09 16:59:13 +00:00
Ryan Petrello
1233462419
add some new changelog entries for 12.0.0 2020-06-09 12:39:10 -04:00
Ryan Petrello
0ad78874ce
remove TCP ports for redis (it only listens on a unix domain socket) 2020-06-09 12:29:33 -04:00
Shane McDonald
2bbbb04499
Bump version to 12.0.0 2020-06-09 12:19:17 -04:00
nixocio
fa1294922b Add support Prompt on Launch for Workflow Job Template 
Add support Prompt on Launch for Workflow Job Template

see: https://github.com/ansible/awx/issues/5819
 2020-06-09 11:40:19 -04:00
softwarefactory-project-zuul[bot]
277b6897fa
Merge pull request #7240 from rebeccahhh/memcache-memories 
remove memcache entirely, add in some django redis to cover it's absence

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-06-09 15:37:04 +00:00
Ryan Petrello
b7ac5f0ffb
Merge pull request #4395 from fosterseth/fix-parents_converge_settable_api_backport 
[backport] Make all_parents_must_converge settable when creating node
 2020-06-09 11:29:34 -04:00
Rebeccah
d7f9e66710
added changelog entry 2020-06-09 11:09:04 -04:00
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