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
11,985 Commits 54 Branches 19 Tags
Commit Graph

11985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlanCoding
3cfe544ada update workflows to work with new channels implementation 2016-10-12 13:54:13 -04:00
Chris Church
2488e1e3f0 Show actual settings module in use. 2016-10-12 13:40:05 -04:00
Jake McDermott
b827a711c5 Merge pull request #3700 from jakemcdermott/noissue_fix_rabbitmq_setting_migration 
actually invoke template module in install role
 2016-10-11 18:44:56 -04:00
Jake McDermott
d3a36aefc3 Merge pull request #3686 from jakemcdermott/noissue_fix_rabbitmq_setting_migration 
ensure CLUSTER_HOST_ID setting is consumed by settings migration when updating tower
 2016-10-11 18:13:15 -04:00
Jared Tabor
1fe783f63c Merge pull request #3699 from jaredevantabor/secure-socket 
switching websocket to secure websocket (wss://) dpending on protocol
 2016-10-11 14:25:58 -07:00
jaredevantabor
9274b90b9b switching websocket to secure websocket (wss://) dpending on protocol 2016-10-11 14:22:42 -07:00
Graham Mainwaring
ddf67ed915 Merge pull request #3688 from ghjm/win_scan_scripts_include 
Include Powershell scripts for Windows scan jobs
 2016-10-11 14:19:38 -04:00
Graham Mainwaring
27d29ce204 Include Powershell scripts for Windows scan jobs 2016-10-11 12:30:06 -04:00
Alan Rominger
7bd19b8e98 Merge pull request #3687 from AlanCoding/wf_fixes 
Workflow serializer fixes
 2016-10-11 08:39:01 -04:00
AlanCoding
21a04f196c workflow serializer fixes 2016-10-10 17:13:02 -04:00
Jared Tabor
3be9bf19ee Merge pull request #3672 from jaredevantabor/groups-hosts-yaml-parser 
YAML parsing groups and hosts extra variables
 2016-10-10 11:05:36 -07:00
Ryan Fitzpatrick
d57c0152fb Include defaul channel layer route and upgrade amqp version (#3675) 2016-10-10 13:32:34 -04:00
John Mitchell
236d4df460 fixed manual project select2 population 2016-10-10 12:31:08 -04:00
Jake McDermott
cd896539f0 Merge pull request #3676 from jakemcdermott/noissue_fix_settings_migration 
use created and modified dates from TowerSettings when migrating to conf Settings
 2016-10-10 12:26:56 -04:00
Jake McDermott
47b2b4322b use created and modified dates from TowerSettings when migrating to conf Settings 2016-10-10 10:25:53 -04:00
Jared Tabor
dbe6f5200f YAML parsing groups and hosts extra variables 
YAML parsing got lost in translation in the 3.0 scuffle
 2016-10-07 14:58:31 -07:00
Wayne Witzel III
e4e878d041 copy nginx config and uwsgi_params 2016-10-07 14:41:34 -04:00
Chris Church
0992e354e3 Prevent removing license via PUT/PATCH/DELETE to /api/v1/settings/system/. 2016-10-07 14:13:51 -04:00
Matthew Jones
2a844b9c42 Add api node request servicer to response headers 2016-10-07 11:40:44 -04:00
Wayne Witzel III
c64392eb67 removing old apache, renaming nginx config 2016-10-07 10:50:30 -04:00
Wayne Witzel III
579df6e215 new configuration files for uwsgi/daphne 2016-10-07 10:47:15 -04:00
Wayne Witzel III
594fa8cf89 Merge pull request #3657 from wwitzel3/jtabor-sockets 
Switch to Django Channels
 2016-10-07 10:39:04 -04:00
Matthew Jones
20b5aa7424 Fix some issues with management commands for clustering 2016-10-07 09:58:47 -04:00
James Laska
77a56b3dfd Properly recognize foreman.enabled 
The ENABLED_VALUE must always be a string.  Thanks to @cchurch for the
suggestion.

Resolves #3632
 2016-10-07 09:50:18 -04:00
Wayne Witzel III
5d8e7c17c2 Merge branch 'devel' into jtabor-sockets 2016-10-07 09:50:03 -04:00
James Laska
5881736769 Properly detect enabled foreman inventory 
Related #3632
 2016-10-07 09:49:31 -04:00
Wayne Witzel III
48d49b41cb revert to old rabbitmq 2016-10-07 09:46:57 -04:00
Jared Tabor
fa894c710b Merge pull request #2 from jaredevantabor/wwitzel3/jtabor-sockets 
Turning debug_mode to false
 2016-10-06 20:19:34 -07:00
Jared Tabor
3a1b4a10c8 Turning debug_mode to false 2016-10-06 20:15:15 -07:00
Jared Tabor
b99289c567 Merge pull request #1 from jaredevantabor/wwitzel3/jtabor-sockets 
Feedback from PR
 2016-10-06 18:46:25 -07:00
Jared Tabor
c6d5f751fb Feedback from PR 
specifically the scope that is used for attaching event listeners
for the $emit/$braodcast/$on that is used for routing socket messages.
Also removing some commented out code
 2016-10-06 18:42:18 -07:00
Wayne Witzel III
163ec843fd update channels reqs 2016-10-06 16:32:35 -04:00
Wayne Witzel III
39f337d933 added model for holding channel group information, updating asgi_amsqp req 2016-10-06 16:16:27 -04:00
John Mitchell
f35fcf86e7 fixed search pagination url issue 2016-10-06 16:14:07 -04:00
Matthew Jones
babe29ebfa Implement cluster health checks 
* Add a local node queue to execute targeted jobs
* Add a setting for active cluster node id (per-node)
* Base the heartbeat time on the `modified` time on the Instance table
* Add periodic task that calls save() on the instance to update the
  heartbeat time if services are up
* Purge/update any ha/instance management commands
* Fix up CELERY_ROUTES settings data structure
 2016-10-06 16:05:39 -04:00
Leigh Johnson
4a4c55a75c Merge pull request #3660 from leigh-johnson/3327 
Host event modal - wrap long strings
 2016-10-06 13:37:27 -04:00
Michael Abashian
3d2541a3e1 Merge pull request #3643 from mabashian/3333-inventory-vars-host-edit 
Format the host vars properly on load when editing a host
 2016-10-06 13:15:31 -04:00
Jim Ladd
aabbd48d17 Merge pull request #3655 from jladdjr/no_issue_clean_tower_image_by_name 
Clean-up tower images by name
 2016-10-06 12:37:16 -04:00
Alan Rominger
cd8aeac5c3 Merge pull request #3644 from AlanCoding/3559_manual_proj 
Set `start` capability to False for manual projects
 2016-10-06 12:04:35 -04:00
Leigh Johnson
dc9344c822 Host event modal - wrap long strings. 2016-10-06 11:53:58 -04:00
Graham Mainwaring
3ffeb5b0ba Merge pull request #3656 from ghjm/scan_windows_fix 
Change names of Windows scan modules to avoid ambiguity
 2016-10-06 10:45:49 -04:00
Wayne Witzel III
9049fb208f Merge branch 'devel' of https://github.com/ansible/ansible-tower into jtabor-sockets 2016-10-06 10:06:30 -04:00
Wayne Witzel III
71c84a6383 convert scheduler to use websocket 2016-10-06 09:58:51 -04:00
Jared Tabor
1b8b4a68b7 Resubscribing the UI to the last group it was on, whenever a disconnect happens that 
was no intentional
 2016-10-05 14:10:40 -07:00
Graham Mainwaring
180209236e Change names of Windows scan modules to avoid ambiguity 2016-10-05 16:43:19 -04:00
Jared Tabor
e80c99e737 removing status checks in socket.service 2016-10-05 10:35:55 -07:00
Jim Ladd
89ae7ebe76 Clean docker images by name 2016-10-05 10:31:45 -04:00
Jared Tabor
5edd9e73c8 removing npm-shrinkwrap to avoid conflict 2016-10-04 16:24:58 -07:00
Jared Tabor
37e282735a fixing statusTip and socketStatus 2016-10-04 14:27:29 -07:00
Jared Tabor
849c48a101 committing first pass at unit test for SocketService 2016-10-04 14:27:29 -07:00