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

9406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III
0c7014eacb nginx config fixes 2016-10-14 13:38:09 -04:00
Wayne Witzel III
1d677dad91 Merge branch 'devel' into channels-deployment 2016-10-14 13:33:51 -04:00
Wayne Witzel III
7ea84d92ef Merge pull request #3716 from wwitzel3/dev-nginx 
Use uwsgi/daphne/nginx for dev
 2016-10-14 13:27:44 -04:00
Wayne Witzel III
0666e40be8 fix make server to run other services 2016-10-14 12:04:30 -04:00
Alan Rominger
330d3d3f6c Merge pull request #3717 from AlanCoding/flake8_31 
flake8 fixes
 2016-10-14 10:08:16 -04:00
AlanCoding
8d89d68d5e flake8 fixes for Jenkins 2016-10-14 09:46:41 -04:00
Wayne Witzel III
90ed95abd1 add https ports 2016-10-14 02:23:12 -04:00
Wayne Witzel III
eb3ec0b083 daphne should listen on 0.0.0.0 2016-10-14 02:00:56 -04:00
Wayne Witzel III
4220246400 use uwsgi/daphne/nginx for dev 2016-10-14 01:45:08 -04:00
Alan Rominger
1979d63c25 Merge pull request #3708 from AlanCoding/ancestors_PR 
Store vars from set_artifact tasks, pipe data through workflows
 2016-10-13 15:59:58 -04:00
Alan Rominger
7022edc646 Merge pull request #3701 from AlanCoding/wf_socket 
Get workflows and channels to work together
 2016-10-13 15:32:43 -04:00
AlanCoding
7472fbae8f insert back in REPLACE_STR import that was lost 2016-10-13 11:05:06 -04:00
AlanCoding
638b07e17b remove yaml and json imports from workflow 2016-10-13 10:47:11 -04:00
Shane McDonald
f0d0a3e20d Merge pull request #3705 from ansible/exclude-setup-test 
Exclude test directory from setup bundle tarballs
 2016-10-13 09:30:16 -04:00
AlanCoding
ef861e5256 move set_artifact module to its own repository 2016-10-12 17:54:35 -04:00
AlanCoding
5d4cf9d4fc Add job artifacts and workflow artifact passing 
artifacts redact from job when no_log is set
parent no_log artifacts treated as survey passwords
 2016-10-12 17:45:50 -04:00
Shane McDonald
c80a8a9c14 Exclude test directory from setup bundle tarballs 
Also using the rsync strategy in the tar-build target. This doesn’t leave behind the empty setup/test directory.
 2016-10-12 16:07:25 -04:00
Chris Church
bedb363613 Merge pull request #3665 from cchurch/prevent-removing-license-via-system-settings 
Prevent removing license via settings
 2016-10-12 14:54:49 -04:00
Chris Church
8883738a7c Fix issue when string list settings field is null. Resolves #3683. 2016-10-12 14:47:22 -04:00
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
Ryan Fitzpatrick
d57c0152fb Include defaul channel layer route and upgrade amqp version (#3675) 2016-10-10 13:32:34 -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
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
Wayne Witzel III
5d8e7c17c2 Merge branch 'devel' into jtabor-sockets 2016-10-07 09:50:03 -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
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
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