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
Wayne Witzel III
699e2c9c6f
Merge pull request #3738 from wwitzel3/nginx-updates
...
make static directory before collecting
2016-10-18 13:01:12 -04:00
Wayne Witzel III
e716f6e259
make static directory before collecting
2016-10-18 12:58:11 -04:00
Wayne Witzel III
dd108549b6
Merge pull request #3736 from wwitzel3/nginx-updates
...
fix static files for API browser
2016-10-18 12:35:35 -04:00
Wayne Witzel III
f5e10bc57c
fix static files for API browser
2016-10-18 12:15:01 -04:00
Wayne Witzel III
c0ae37dd54
Merge pull request #3735 from wwitzel3/nginx-updates
...
Update tower_tools image to run nginx
2016-10-18 11:35:25 -04:00
Wayne Witzel III
e9be93cd70
Update tower_tools image to run nginx
2016-10-18 11:16:38 -04:00
Aaron Tan
5fdd44c3f4
Fix mutable default argument issue.
2016-10-18 09:48:19 -04:00
Alan Rominger
4ba8b87065
Merge pull request #3728 from AlanCoding/workflow_labels
...
Workflow Labels
2016-10-18 08:40:09 -04:00
Chris Church
5e8a7eeb8a
Return empty dict if no license present (or invalid key).
2016-10-18 00:22:15 -04:00
Chris Church
e02d945e1d
Merge pull request #3703 from cchurch/allow-file-scm-urls
...
Enable support for file scheme in SCM URLs.
2016-10-17 23:51:10 -04:00
AlanCoding
41d7bd84a8
implement labels for workflows JT and workflow jobs
2016-10-17 17:38:42 -04:00
Aaron Tan
c595492950
Solve rebase conflicts.
2016-10-17 17:08:05 -04:00
Aaron Tan
21feae7c11
Rename default timeout and remove runtime_flag.
2016-10-17 16:56:39 -04:00
Aaron Tan
2362f34d27
Implement pluggable job explanation.
2016-10-17 16:56:39 -04:00
Aaron Tan
701c23171f
Remove timeout fields from sys job & adhoc cmd.
2016-10-17 16:56:39 -04:00
Aaron Tan
96e3228c9d
Change global settings structure and fix potential celery issue.
2016-10-17 16:56:39 -04:00
Aaron Tan
651a09f5fb
Remove stdout indicator.
2016-10-17 16:56:39 -04:00
Aaron Tan
33952808c4
Readability improvement and job explaination added.
2016-10-17 16:56:39 -04:00
Aaron Tan
70481414c6
Migration update.
2016-10-17 16:56:39 -04:00
Aaron Tan
69be94feb9
Implement global job timeout mechanism.
2016-10-17 16:56:39 -04:00
Aaron Tan
2eda6b9528
Implement timeout on other unified jobs/JTs.
2016-10-17 16:56:39 -04:00
Aaron Tan
d52e237ea0
Implement timeout on job/job-template.
2016-10-17 16:56:39 -04:00
Aaron Tan
37139301b4
Add job timeout mechanism to tasks.
2016-10-17 16:53:54 -04:00
Wayne Witzel III
f5f4785714
Merge pull request #3668 from wwitzel3/channels-deployment
...
Channels deployment
2016-10-17 15:46:42 -04:00
Aaron Tan
f4c93f842d
Merge pull request #3715 from jangsutsr/3380_add_corner_case_check_to_user_can_admin
...
Add corner case check to user can_admin.
2016-10-17 15:32:11 -04:00
Bill Nottingham
2ed50e05c1
Merge pull request #3714 from wenottingham/devel
...
Remove support@ansible.com , clean up some old links.
2016-10-17 15:15:52 -04:00
Wayne Witzel III
d027c98a8f
Merge pull request #3720 from wwitzel3/dev-nginx
...
change static path to match what ui-release produces
2016-10-17 10:07:36 -04:00
Wayne Witzel III
3a323e1b39
change static path to match what ui-release produces
2016-10-17 09:58:15 -04:00
Aaron Tan
d9ac461bb8
Merge pull request #3696 from jangsutsr/3535_add_rbac_check_to_project_validate
...
Patch up missing org access checks in access.py
2016-10-14 14:37:52 -04:00
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
