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

358 Commits

Author SHA1 Message Date
Matthew Jones
cd11a9c1c2 peg compose tag to active branch 2016-12-06 13:32:33 -05:00
AlanCoding
7848198b9f New awx.main.utils directory, distributed task to invalidate settings 2016-12-02 14:36:04 -05:00
AlanCoding
f3427d1359 Logging Integration, ELK docker-compose as update file 2016-11-29 13:09:47 -05:00
Shane McDonald
7342210ca6 Remove awx/job_output in clean target 2016-11-23 08:55:55 -05:00
Shane McDonald
c80a750457 Merge pull request #4012 from shanemcd/activate-venv-flake8 
Activate venv in flake8 target
 2016-11-15 10:11:45 -05:00
Shane McDonald
4330eb7907 Activate venv in flake8 target 2016-11-15 09:54:42 -05:00
Chris Meyers
1883485724 towards virtualenv being exactly requirements.txt 
* Ignore already installed (usually global) packages when installing
requirements.txt into the virtualenv.
 2016-11-15 09:19:29 -05:00
Shane McDonald
5657671fb9 Add unit test artifacts to clean target 2016-11-11 14:39:23 -05:00
Leigh Johnson
0d3eb67bd0 Fixes namespace collision & allows command-line options to be passed to UI build system (#3876) 
* Fixes BrowserSync window.name namespace collision #3872

* Allow command-line arguments to be passed to development UI builds.
Add support for --ng-debug and --router-debug flags to turn on Angular's
$log service and ui-router's trace utility.
Cleans up development debug settings & defunct websocket configuration.

Resolves lingering issues raised by trying read asynchronously-loaded config file during AngularJS config phase. #3872

* shrinkwrap updated minimist

* update CONTRIBUTING.md to include UI build options

* feedback/review
 2016-11-09 12:49:18 -05:00
Leigh Johnson
38e40c7eba Hook up npm script target for jshint (#3916) 
* Hook up npm script target for jshint

* Shrinkwrap ui dependencies
 2016-11-09 09:53:58 -05:00
Shane McDonald
fdfce0bc73 Print flake8 results to stdout and output to file 
I think?
 2016-11-08 11:06:48 -05:00
Matthew Jones
88a8810815 Merge pull request #3729 from sundeep-co-in/STAGE 
enable django i18n
 2016-11-04 15:52:33 -04:00
Matthew Jones
fa0780b9d0 Optimize uwsgi launching in dev container and prod 
* Set --master flag so we have a preforking master process to manage
  subprocs
* Set max-requests to 1000 so uwsgi will recycle processes after 1000
  requests
* Set --no-orphans so uwsgi will track child processes and clean them up
  in order to respawn children
* Turn stats on in the container and install uwsgitop in dev
  requirements so we can track uwsgi stats
 2016-11-04 13:38:23 -04:00
Shane McDonald
c99f240c89 Add node_modules bins to Makefile PATH 2016-11-02 14:30:07 -04:00
Graham Mainwaring
f3cb5816d5 Merge pull request #3843 from ghjm/devel 
Can't use bash syntax since make uses /bin/sh
 2016-11-02 14:01:12 -04:00
Graham Mainwaring
b05cd9e5c6 Can't use bash syntax since make uses /bin/sh 2016-11-02 13:46:49 -04:00
Shane McDonald
d42ec44010 Use grunt variable in Makefile 2016-11-02 13:35:26 -04:00
sundeep-co-in
2ddcffc184 zanata config loc 2016-10-27 22:26:39 +05:30
sundeep-co-in
e908bc34e6 Merge branch 'devel' of https://github.com/sundeep-co-in/ansible-tower into STAGE 2016-10-27 22:23:39 +05:30
Shane McDonald
bbf185cd0b Add awx/public to clean target 2016-10-27 10:17:37 -04:00
sundeep-co-in
c1a5fb3312 resolve conflict 2016-10-27 08:13:02 +05:30
Leigh Johnson
2c8d295132 UI Build System - new interface 
Use `make ui-devel` to build a development/debug version of the  UI, with source maps,
without raising any additional browser-sync or filesystem polling.
 2016-10-26 16:53:36 -04:00
sundeep-co-in
3bf72f1dba add manage_translations 2016-10-26 16:47:49 +05:30
sundeep-co-in
475d6ed110 Merge branch 'devel' of https://github.com/sundeep-co-in/ansible-tower into STAGE 2016-10-26 10:23:57 +05:30
Leigh Johnson
4b34c6987a Remove make languages target pending delivery of .po files 2016-10-25 15:26:45 -07:00
Takao Fujiwara
40b94a38a8 Enable message i18n with angular-gettext 
Signed-off-by: Takao Fujiwara <tfujiwar@redhat.com>
 2016-10-25 15:26:45 -07:00
sundeep-co-in
576db5120f resolve conflict 2016-10-25 16:18:14 +05:30
Matthew Jones
e8669b0cbf Support celeryd autoreloading for dev environment 2016-10-20 13:27:36 -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
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
Wayne Witzel III
a27c708127 let nginx serve static files 2016-10-18 14:52:10 -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
e716f6e259 make static directory before collecting 2016-10-18 12:58:11 -04:00
Wayne Witzel III
f5e10bc57c fix static files for API browser 2016-10-18 12:15:01 -04:00
Wayne Witzel III
e9be93cd70 Update tower_tools image to run nginx 2016-10-18 11:16:38 -04:00
sundeep-co-in
78a8ce9479 django i18n 2016-10-18 18:10:39 +05:30
Wayne Witzel III
3a323e1b39 change static path to match what ui-release produces 2016-10-17 09:58:15 -04:00
Wayne Witzel III
0666e40be8 fix make server to run other services 2016-10-14 12:04:30 -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
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
Wayne Witzel III
5d8e7c17c2 Merge branch 'devel' into jtabor-sockets 2016-10-07 09:50:03 -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
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
Jim Ladd
89ae7ebe76 Clean docker images by name 2016-10-05 10:31:45 -04:00
Leigh Johnson
bdfed9c87f Escape $ in docker-clean target 
Before: https://gist.github.com/leigh-johnson/98331b280b1679bd4c0e4b02f7c59b00
After: Yay!
 2016-10-04 00:47:03 -04:00
Wayne Witzel III
530a5c0c88 merging devel 2016-10-03 10:35:50 -04:00
Shane McDonald
15eaac049c Add pycparser to SRC_ONLY_PKGS 
Fixes stuff due to https://github.com/pyca/cryptography/issues/3187
 2016-10-03 09:37:06 -04:00
Chris Meyers
dd3c3c9f29 Merge branch 'feature-ha_task_manager' into devel 2016-09-29 10:27:17 -04:00