9496 Commits

Author SHA1 Message Date
Wayne Witzel III
ced3c41df9 add auth_token verification to websocket 2016-10-24 19:42:53 -04:00
Wayne Witzel III
04bfdf8617 Merge branch 'devel' of https://github.com/ansible/ansible-tower into channels-fixups 2016-10-24 19:42:16 -04:00
Matthew Jones
088e9c0291 Merge pull request #3763 from ansible/performance_postgres_config
Adding customized postgres.conf to setup
2016-10-24 16:32:46 -04:00
Graham Mainwaring
a59b226a68 Merge pull request #3764 from ghjm/packaging_3.1
RPM and setup playbook fixes for 3.1
2016-10-24 15:57:46 -04:00
Graham Mainwaring
b143f53888 Fix RPM builds and setup for 3.1 2016-10-24 14:51:53 -04:00
Matthew Jones
cd48427189 Merge pull request #3757 from ansible/AlanCoding-patch-1
Only fill scm_revision env var if project for job exists
2016-10-24 13:27:19 -04:00
Matthew Jones
3eddc1f770 Merge pull request #3761 from AlanCoding/proj_update_death
Hack and slash of project directory checks
2016-10-24 13:13:56 -04:00
AlanCoding
18cb20ebb6 remove code that checks for local project directory to give status 2016-10-24 12:42:04 -04:00
Matthew Jones
7c7d2e37ed Fix some issues syncing playbooks
* Build a list of playbooks and store it in the database at sync time
* Fix an issue running playbook sync on jobs for scan jobs
* Remove a TODO that was unneeded
2016-10-24 11:32:21 -04:00
Alan Rominger
3121839704 only fill scm_revision var if project for job exists 2016-10-24 09:43:17 -04:00
Chris Meyers
0f0d9953b3 bump os-client-config for shade 2016-10-22 09:51:12 -04:00
Chris Meyers
7050c4e09e Revert "no one knows wtf the files in this dir a for, so don't serve them"
This reverts commit b3cccea70368ba1550366380e583751df1df061b.
2016-10-21 10:04:50 -04:00
Matthew Jones
3d8eb48986 Test for HA license before allowing cluster job start 2016-10-20 16:50:49 -04:00
Matthew Jones
4d792bef9d Merge pull request #3755 from ansible/cluster_project_sync
Rearchitect project sync for standalone and clusters
2016-10-20 16:04:03 -04:00
jaredevantabor
6bd20c6433 Adding the token to the socket url 2016-10-20 12:58:45 -07:00
Matthew Jones
73b5b47e94 flake8 cleanup 2016-10-20 15:27:59 -04:00
Matthew Jones
6e22460f1e Add scm revision to the job model
This also cleans up flake8 issues
2016-10-20 15:18:05 -04:00
Matthew Jones
ca32c5fd21 scm_revision should be used for job_type run 2016-10-20 14:56:15 -04:00
Matthew Jones
4562faa858 Pass scm revision in env and extra var for job run 2016-10-20 14:42:28 -04:00
Matthew Jones
2a504ff040 Shift migration files around for conflict 2016-10-20 14:42:12 -04:00
Alan Rominger
88409bcc3e Merge pull request #3713 from AlanCoding/job_can_read
Add can_read method to JobAccess
2016-10-20 14:20:54 -04:00
Alan Rominger
56c8ddd9cb Merge pull request #3724 from AlanCoding/3669
Get node-node sublists to show for Workflow job nodes
2016-10-20 14:18:05 -04:00
Matthew Jones
03ca8a571a Update clustering acceptance docs 2016-10-20 13:37:22 -04:00
Matthew Jones
ba469a8c13 Remove spurious workflow job class 2016-10-20 13:34:10 -04:00
Matthew Jones
0f93b875ca Add migrations for execution node and project upds 2016-10-20 13:30:44 -04:00
Matthew Jones
e6bcc039f2 Rearchitect project update strategy
* Instead of using a fanout for project updates initial project
  updates will sync the latest commit hash
* Prior to a node running a job it will ensure that the latest project
  is synced
2016-10-20 13:30:44 -04:00
Matthew Jones
b906469b40 Add execution node information 2016-10-20 13:27:36 -04:00
Matthew Jones
e8669b0cbf Support celeryd autoreloading for dev environment 2016-10-20 13:27:36 -04:00
jaredevantabor
d84912bb2a potentially adding token to websocket url 2016-10-20 10:02:28 -07:00
jaredevantabor
bc1561fc67 Removing front end double parsing of socket messages
previously the socket messages were double encoded w/ quotations
2016-10-20 09:17:50 -07:00
Wayne Witzel III
af82273948 don't double encode channel messages 2016-10-20 09:37:06 -04:00
Alan Rominger
532ee059ea Merge pull request #3746 from AlanCoding/uwsgi_reload
Hopefully get uwsgi to auto reload
2016-10-20 09:08:34 -04:00
Aaron Tan
22329e5b72 Merge pull request #3502 from jangsutsr/2363_implement_job_timeout
Implement job timeout
2016-10-19 23:54:51 -04:00
James Laska
6c4dd57368 Copy requirements individually to avoid invalidating docker cache 2016-10-19 15:56:34 -04:00
Chris Meyers
5b60b14227 bump shade version 2016-10-19 14:18:00 -04:00
James Laska
ac553f7368 Add image to unit-test docker-compose 2016-10-19 13:48:27 -04:00
James Laska
ff8966dd48 Update unittest container to build ui-deps 2016-10-19 12:35:59 -04:00
AlanCoding
e7f16620bb Attempt to get uwsgi to auto reload 2016-10-19 10:39:17 -04:00
Chris Meyers
54683cbff4 fix amqp dep 2016-10-18 18:42:12 -04:00
Chris Meyers
cbffb23d41 no one knows wtf the files in this dir a for, so don't serve them 2016-10-18 17:27:23 -04:00
Chris Meyers
87ea864466 sendfail syscall bad with crappy filesystems 2016-10-18 17:21:14 -04:00
Chris Meyers
64a15db91b fix nginx static files using 2016-10-18 15:51:01 -04:00
Wayne Witzel III
1e658219c4 Merge pull request #3741 from wwitzel3/nginx-static
fix awx/ui static path
2016-10-18 15:08:16 -04:00
Wayne Witzel III
99a009b613 fix awx/ui static path 2016-10-18 15:05:05 -04:00
Chris Meyers
4e049546a3 Merge pull request #3740 from wwitzel3/nginx-static
let nginx serve static files
2016-10-18 14:54:54 -04:00
Wayne Witzel III
a27c708127 let nginx serve static files 2016-10-18 14:52:10 -04:00
Chris Meyers
47495b4ea6 fix mime type issues 2016-10-18 14:38:24 -04:00
Chris Meyers
0c5d6e503d Merge pull request #3739 from chrismeyersfsu/improvement-nginx_honcho
put nginx into honcho flow
2016-10-18 14:23:54 -04:00
Chris Meyers
ad2bee1f57 sym link nginx config by popular demand 2016-10-18 14:23:33 -04:00
Chris Meyers
4f6d966bab put nginx into honcho flow
* allows for make docker-compose-test then make honcho flow
2016-10-18 14:19:18 -04:00