External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
5,533 Commits 65 Branches 102 Tags
4a6bceaeb0f07a8f161eed8cbad776f6e3b4a75c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Meyers 4a6bceaeb0 Merge pull request #504 from chrismeyersfsu/license-a_piece_of_my_soul 
2.4.0 python lib licenses
 2015-11-17 15:49:36 -05:00
Chris Meyers 128f516e81 added dm.xmlsec.bindin license 2015-11-17 15:48:59 -05:00
Chris Meyers b37af76599 update requirements.txt README 2015-11-16 11:20:57 -05:00
Chris Meyers 46428e7674 add pyrad to requirements.txt 2015-11-16 11:15:08 -05:00
Chris Meyers a1f9476f6d added appdirs 2015-11-16 11:14:17 -05:00
Chris Meyers 5142732f59 Merge pull request #505 from chrismeyersfsu/fix-django-radius 
bump django-radius to include new license
 2015-11-16 10:05:49 -05:00
Chris Meyers 693a4412c8 bump django-radius to include new license 2015-11-16 09:59:41 -05:00
Chris Meyers 47dc5b62ba add django-radius license 2015-11-16 09:26:02 -05:00
Chris Meyers 93076533c7 python openid 2015-11-13 15:29:49 -05:00
Chris Meyers e92004c6c5 remove duplicate, wrongfully created, license files 2015-11-13 15:02:37 -05:00
Chris Meyers 0cd7746290 keep pre-existing license files 2015-11-13 15:01:05 -05:00
Chris Meyers 4f66949cd9 2.4.0 python lib licenses 2015-11-13 14:51:28 -05:00
Chris Meyers 9829d83839 Merge pull request #498 from chrismeyersfsu/fix-delete_when_license_expired 
allow multi-org expired licenses to delete orgs
 2015-11-13 10:12:44 -05:00
Chris Meyers 97c56d451e allow multi-org expired licenses to delete orgs 2015-11-12 15:33:00 -05:00
Chris Meyers c52c7c2f9f Merge pull request #494 from chrismeyersfsu/feature-socket_tests 
adds socket tests
 2015-11-06 14:39:03 -05:00
Chris Meyers e928aa40a5 Merge pull request #493 from chrismeyersfsu/feature-git_hook 
added git pre commit hook to run flake8
 2015-11-06 10:48:38 -05:00
Chris Meyers 3f4913f5ab adds socket tests 2015-11-06 10:30:56 -05:00
Chris Meyers 014419f6ca Merge pull request #492 from chrismeyersfsu/fix-ha_remove 
fixes remove_instance error
 2015-11-06 07:56:50 -05:00
Chris Meyers 0b4efa3fcd added git pre commit hook to run flake8 2015-11-06 07:38:29 -05:00
Chris Meyers dbbfde0d25 fixes remove_instance error 
* Initialize object attribute to None so a later if check that depends
on that attributes succeeds. The attribute is related to unifying the
command line args to the *_instance command set.
* Added regression test case
 2015-11-06 07:19:09 -05:00
Chris Meyers 5845730cf6 Merge pull request #485 from chrismeyersfsu/fix-openstack_jt 
add openstack cred file to env for jt launch
 2015-11-05 11:28:26 -05:00
Chris Meyers a0f327e6c5 Merge pull request #484 from chrismeyersfsu/feature-stdout_format 
add content encoding for json to stdout
 2015-11-03 10:11:24 -05:00
Chris Meyers 0889f1ebe1 add content encoding for json to stdout 
* content_format=ansi&content_encoding=base64 support added to
?format=json on stdout endpoint.

Currently the json `content` value is made into html.
This change will allow support for consuming STDOUT for display on the
terminal.
 2015-11-03 09:38:49 -05:00
Chris Meyers 3a8044754c add openstack cred file to env for jt launch 2015-11-03 09:37:38 -05:00
Chris Meyers bcc2cb7914 Merge pull request #479 from chrismeyersfsu/fix-basic_auth_cookies 
if basic auth in headers, don't use cookie token
 2015-10-19 17:07:14 -04:00
Chris Meyers 1db26531a1 if basic auth in headers, don't use cookie token 
* Allows for basic auth to be used when cookie token fails
 2015-10-19 14:49:15 -04:00
Chris Meyers f051c13374 list cust inv scripts with deleted orgs 2015-10-14 07:36:32 -05:00
Chris Meyers 4c14827f46 add placeholder for ansible callback plugin path var 2015-10-12 13:36:33 -05:00
Chris Meyers 1bcfc67a52 allow user to add ansible callback plugin paths to job runtime 2015-10-12 13:33:46 -05:00
Chris Meyers 4d7c02aae3 Merge pull request #471 from chrismeyersfsu/fix-consolidate_config 
consolidate auth configs to session.py
 2015-10-09 10:09:02 -04:00
Chris Meyers dfdd567cbc Merge pull request #470 from chrismeyersfsu/feature-license_enforce2 
license enforcement
 2015-10-09 10:08:51 -04:00
Chris Meyers ad383ebccc license enforcement 
* add rebrand and auth_enterprise feature to license
* enforce auth_enterprise by not surfacing auth callback info at /auth
endpoint
 2015-10-08 18:00:29 -04:00
Chris Meyers 83fe3282dc add basic auth enabled / disabled setting 2015-10-07 11:36:08 -04:00
Chris Meyers dcd731071f pin django debug toolbar for django dep reason 
* fix IPy dep
* new django debug toolbar released today, broke things. Pin to our old
version of django to ensure success.
 2015-10-07 11:34:50 -04:00
Chris Meyers f213577f6b expose session settings to user 2015-10-07 11:32:45 -04:00
Chris Meyers 815081eec1 correct egg names for pip dependency resolution 2015-10-07 11:32:22 -04:00
Chris Meyers c3a387c603 Merge pull request #434 from chrismeyersfsu/fix-rbac_performance2 
use subqueries instead of python ids
 2015-10-02 09:49:49 -04:00
Chris Meyers 5e7473e101 Merge pull request #457 from chrismeyersfsu/fix-stdout_dl_token 
allow token in get params at stdout endpoint
 2015-10-02 08:59:07 -04:00
Chris Meyers 22f0a4b79a allow token in get params at stdout endpoint 2015-10-01 17:25:21 -04:00
Chris Meyers 73471ead7e Merge branch 'feature-session_limit3' into devel 2015-10-01 16:28:37 -04:00
Chris Meyers 4434d336a3 notify all socket session of a token 2015-10-01 16:27:49 -04:00
Chris Meyers b7cb8c7624 Merge pull request #452 from chrismeyersfsu/fix-options_cap 
add appropriate help_text to run_ad_hoc_command
 2015-09-30 14:19:37 -04:00
Chris Meyers 88698ff78b Merge pull request #449 from chrismeyersfsu/fix-job_events_jenkins 
influence callback receiver single worker
 2015-09-30 14:19:09 -04:00
Chris Meyers 833cbce9e0 add appropriate help_text to run_ad_hoc_command 2015-09-30 14:07:50 -04:00
Chris Meyers 35abd0cc07 influence callback receiver single worker 2015-09-30 12:39:00 -04:00
Chris Meyers 052929d209 Merge pull request #446 from chrismeyersfsu/feature-session_limit2 
Feature session limit2
 2015-09-30 11:11:36 -04:00
Chris Meyers 4163492e81 add auth timeout header to login response 2015-09-29 15:49:42 -04:00
Chris Meyers b350eef3f0 session limit invalidation events via socket.io 2015-09-29 14:10:26 -04:00
Chris Meyers df31991a1a add docker-compose-test directive to Makefile 2015-09-29 10:46:17 -04:00
Chris Meyers 4111056b81 add docker-compose-test directive to Makefile 2015-09-29 10:45:25 -04:00
Chris Meyers 000d26d7e3 session limit enforcement 
* upon creating a new session, invalidate oldest sessions
 2015-09-28 14:17:28 -04:00
Chris Meyers 12180531da Merge pull request #432 from chrismeyersfsu/feature-session_info 
add Auth-Token-Timeout to http headers
 2015-09-23 13:30:16 -04:00
Chris Meyers eb8219fd9f add Auth-Token-Timeout to http headers 2015-09-23 10:30:19 -04:00
Chris Meyers 2f824df9ee use subqueries instead of python ids 2015-09-22 22:41:25 -04:00
Chris Meyers 6c0e76d7e9 Merge pull request #418 from jlaska/release_2.3 
Add bundled licenses documentation
 2015-09-18 15:24:08 -04:00
Chris Meyers 8d3c7353fb vendored python licenses 2015-09-18 13:04:42 -04:00
Chris Meyers 92bdd776c9 rbac job & job template performance fix 2015-09-15 10:18:46 -04:00
Chris Meyers d4bc5dfaef Merge pull request #413 from chrismeyersfsu/fix-rbac_performance 
performance fix
 2015-09-15 10:16:46 -04:00
Chris Meyers 0e8e09b0ac rbac job & job template performance fix 2015-09-14 16:25:33 -04:00
Chris Meyers 8e603dc18d Merge pull request #407 from chrismeyersfsu/feature-yaml_fallback 
fallback to simple yaml parser if yaml import fail
 2015-09-07 08:09:38 -04:00
Chris Meyers 44f5e285a0 Merge pull request #403 from chrismeyersfsu/fix-python_path 
more carefully add to python path
 2015-09-04 13:57:32 -04:00
Chris Meyers adb912a8d6 Merge pull request #404 from chrismeyersfsu/fix-setup_privilage 
pair --ask-xxx-pass with respective escalation
 2015-09-04 13:57:21 -04:00
Chris Meyers b3e20b843d more carefully add to python path 
* ensure our path is the first in the sys.path list instead of
blindly poping and pushing onto the path
 2015-09-04 13:43:24 -04:00
Chris Meyers 2ecbb07af3 Merge pull request #402 from chrismeyersfsu/feature-config_check_local_machine_user 
check local user root or not in ./configure
 2015-09-03 15:09:05 -04:00
Chris Meyers ee3de2b209 Merge pull request #397 from chrismeyersfsu/fix-python_paths 
fixes executing processes with correct PYTHONPATH will pickup .pth files
 2015-09-02 09:20:23 -04:00
Chris Meyers 9f33127919 fixes jenkins failures 
* include requirements.txt in requirements_jenkins.txt
* include requirements.txt in requirements_dev.txt
* alter Makefile to NOT call the requirements rule in the requirements_*
rules. Again, this is now handled by the -r requirements.txt in the
respective _*.txt file.
* install jenkins requirements "globally" (in the virtualenv)
 2015-09-02 08:23:11 -04:00
Chris Meyers a93babcbaf Merge pull request #396 from chrismeyersfsu/fix-configure_py2.6 
remove reading inventory file in config process
 2015-09-01 20:32:39 -04:00
Chris Meyers 1f06a95c40 fixes executing processes with correct PYTHONPATH will pickup .pth files 2015-09-01 18:30:39 -04:00
Chris Meyers 442de37441 Merge pull request #386 from chrismeyersfsu/fix-offline_remote 
move offline check from preflight to setup.sh
 2015-08-24 12:21:16 -04:00
Chris Meyers 30dc5ec434 remove hard coded epel6 build; support epel 7 
* corrects epel7 testing .repo
 2015-08-24 11:45:38 -04:00
Chris Meyers e210eeaf59 Merge branch 'release_2.3' into fix-offline_remote 2015-08-24 08:54:32 -04:00
Chris Meyers c038bdb1d5 flake8 fixes 2015-08-24 08:48:53 -04:00
Chris Meyers 38435648c6 Merge branch 'feature-offline_merge' into release_2.3 2015-08-21 16:21:12 -04:00
Chris Meyers a9e4377683 removed need for DIST and DIST_MAJOR specification 2015-08-20 10:46:04 -04:00
Chris Meyers 59b5722838 init offline installer builder 2015-08-20 10:41:28 -04:00
Chris Meyers e80dcd9645 reference requirements in requirements_dev 2015-08-18 16:21:24 -04:00
Chris Meyers 171d5abf33 allow unicode in stdout. 2015-08-17 14:30:00 -04:00
Chris Meyers a07bc30be7 successfully install requirements on python 2.6 
jsonschema conditionally pulls in functools32 if python2.7 else it uses
2.6 packages.
 2015-08-17 14:29:46 -04:00
Chris Meyers 99fb641b1b all vendor dependencies expressed in requirements.txt 2015-08-17 11:17:53 -04:00
Chris Meyers aaea561c05 Merge pull request #378 from ansible/fix-rpm 
Fix rpm
 2015-08-17 10:50:19 -04:00
Chris Meyers 4480c05d4e Merge branch 'chrismeyersfsu-job-relaunch2' 2015-08-10 15:43:28 -04:00
Chris Meyers a19dede360 Merge branch 'job-relaunch2' of github.com:chrismeyersfsu/ansible-tower into chrismeyersfsu-job-relaunch2 2015-08-10 15:43:15 -04:00
Chris Meyers 5f4f7e0aaf Merge pull request #363 from chrismeyersfsu/fix-unicode 
allow unicode in stdout.
 2015-08-10 11:26:20 -04:00
Chris Meyers dfff6b218a correctly inherit extra_vars 
* inherit extra_vars from job_template
* overwrite with extra vars survey default vars
* overwrite with job extra_vars
* bypass extra_vars inherit logic for job relaunch
* with tests
 2015-08-10 11:24:26 -04:00
Chris Meyers fca62d1596 correctly inherit extra_vars 
* inherit extra_vars from job_template
* overwrite with extra vars survey default vars
* overwrite with job extra_vars
 2015-08-07 16:01:41 -04:00
Chris Meyers 7c315ebd33 allow unicode in stdout. 2015-08-07 13:46:39 -04:00
Chris Meyers b907a49dc1 jenkins needs unittest2 also 2015-08-07 09:39:40 -04:00
Chris Meyers d6098b15cb unittest2 needed to run unit tests 2015-08-07 09:39:08 -04:00
Chris Meyers 0fb5e09ed4 successfully install requirements on python 2.6 
jsonschema conditionally pulls in functools32 if python2.7 else it uses
2.6 packages.
 2015-08-06 13:55:22 -04:00
Chris Meyers b01c2d2ad1 fixes stoud formats unicode problem 2015-08-05 21:59:05 -04:00
Chris Meyers fa1643e330 all vendor dependencies expressed in requirements.txt 2015-08-05 08:10:16 -04:00
Chris Meyers e98ee0b428 Merge pull request #330 from chrismeyersfsu/fix-update_instance 
change update_instance to only take --primary role flag
 2015-07-31 15:39:42 -04:00
Chris Meyers 3bc2a38dfe Merge pull request #323 from chrismeyersfsu/fix-job_survey_vars 
on job template launch inherit variables in the following hierarchy
 2015-07-31 15:37:17 -04:00
Chris Meyers 397158e847 Merge pull request #328 from chrismeyersfsu/fix-ansi 
fixes stdout formats unicode problem
 2015-07-31 14:51:55 -04:00
Chris Meyers f64a48a98f python 2.6 safe total_seconds 2015-07-30 13:40:31 -04:00
Chris Meyers b0f55c832d invoke redis in a way that works on centos and ubuntu 2015-07-30 08:37:21 -04:00
Chris Meyers 456f460ed9 add path needed for unittest to find redis on centos 6.5 2015-07-29 16:16:00 -04:00
Chris Meyers 34ecd4e5b6 use python2.6 safe unittest2 2015-07-29 15:07:40 -04:00
Chris Meyers 0ce3a240e6 on job template launch inherit variables in the following hierarchy 
(bottom up):

* Job Launch Extra Vars
* Job Template Survey (defaults)
* Job Template Extra vars
 2015-07-28 09:21:43 -04:00
Chris Meyers 9ee9d9031a fixes stoud formats unicode problem 2015-07-24 14:50:36 -04:00