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,214 Commits 65 Branches 102 Tags
eb8219fd9f7fa279d45159b9b69aed8308183c98
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Meyers eb8219fd9f add Auth-Token-Timeout to http headers 2015-09-23 10:30:19 -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
Chris Meyers 8a453d51b2 change update_instance to only take --primary role flag 
* removed --secondary option
 2015-07-24 08:46:34 -04:00
Chris Meyers 9f95fafc33 relax performance unit test requirement strict timeout 2015-07-20 12:16:36 -04:00
Chris Meyers b654c6dd3e more flake8 2015-07-20 11:33:28 -04:00
Chris Meyers 2dc22042ee flake8 fixes 2015-07-20 11:21:03 -04:00
Chris Meyers 7af1d5530d Merge pull request #312 from chrismeyersfsu/feature-fact_save_performance 
fact save test performance
 2015-07-17 10:25:05 -04:00
Chris Meyers fd3422437d Merge pull request #311 from chrismeyersfsu/fix-workload_generator4 
use file fact scan data for file fact scan module scans
 2015-07-17 10:24:52 -04:00
Chris Meyers 408e25442d flake8 fixes 2015-07-15 12:18:46 -04:00
Chris Meyers 1783a61f9e Merge pull request #313 from chrismeyersfsu/fix-flake8 
flake8 fixes
 2015-07-15 12:13:54 -04:00
Chris Meyers 9073d3a6f0 flake8 fixes 2015-07-15 12:10:35 -04:00
Chris Meyers d784b72adb fact save test performance 2015-07-14 08:52:27 -04:00
Chris Meyers 3a07c85898 use file fact scan data for file fact scan module scans 2015-07-13 15:27:23 -04:00
Chris Meyers ef95cf091e Merge pull request #303 from chrismeyersfsu/fix-mongodb_logging2 
demote mongo db connection failed logging to info
 2015-07-03 11:35:42 -04:00
Chris Meyers b4b8909239 demote mongo db connection failed logging to info 2015-07-02 15:45:09 -04:00
Chris Meyers 89688a9c26 Merge pull request #300 from chrismeyersfsu/fix-workload_generator3 
python 2.6 compatible total_seconds
 2015-06-29 17:53:20 -04:00
Chris Meyers 8f804cf9fa python 2.6 compatible total_seconds 2015-06-29 16:55:56 -04:00
Chris Meyers 8e8071b28f Merge pull request #299 from chrismeyersfsu/fix-scan_services 
for scan_services against RH machines. Do not depend on US language
 2015-06-29 11:30:41 -04:00
Chris Meyers d076835051 for scan_services against RH machines. Do not depend on US language 2015-06-29 11:26:58 -04:00
Chris Meyers 6e05a38d9c Merge pull request #297 from chrismeyersfsu/fix-workload_generator 
forgot to remove the old fact workload generator
 2015-06-25 13:55:30 -04:00
Chris Meyers 8095f88e38 Merge pull request #295 from chrismeyersfsu/feature-fact_cache_receiver_verbose_logging 
added more logging for fact cache receiver
 2015-06-24 16:32:02 -04:00
Chris Meyers 713f18438c added more logging for fact cache receiver 2015-06-24 14:07:18 -04:00
Chris Meyers 59f4844e02 Merge pull request #292 from chrismeyersfsu/fix-fact_receiver_logging 
register a logger for fact receiver
 2015-06-24 09:21:31 -04:00
Chris Meyers 5eb4f51be9 Merge pull request #294 from chrismeyersfsu/feature-IPy 
robust check for HA env setup
 2015-06-24 09:21:26 -04:00
Chris Meyers 31b9304165 register a logger for fact receiver 2015-06-23 11:39:44 -04:00
Chris Meyers c6e3798259 Merge pull request #293 from chrismeyersfsu/fix-age_deleted 
flake8
 2015-06-23 11:24:13 -04:00
Chris Meyers 4669c44af9 robust check for HA environment setup 2015-06-23 11:21:00 -04:00
Chris Meyers 0344a801fe consider 127.0/8 LOOPBACK 2015-06-23 10:53:07 -04:00
Chris Meyers d1c361021a add IPy python library to deal with ip addresses 2015-06-23 10:36:23 -04:00
Chris Meyers 41de9c9f9f flake8 2015-06-23 07:58:01 -04:00
Chris Meyers b7411f67f6 Merge pull request #291 from chrismeyersfsu/fix-age_deleted 
when aging, use a more compact age to stay within username 30 char restriction
 2015-06-22 13:14:52 -04:00
Chris Meyers bd61261454 when aging, use a more compact age to stay within username 30 char restriction 2015-06-22 13:06:50 -04:00
Chris Meyers c17e654161 forgot to remove the old fact workload generator 2015-06-19 14:13:52 -04:00
Chris Meyers 0dabe450ac Merge pull request #289 from chrismeyersfsu/fix-fact_scan_inventory_host 
Allow fact scanning hosts with same name in two different inventories
 2015-06-19 13:13:23 -04:00
Chris Meyers 7e6dbd616d Allow fact scanning hosts with same name in two different inventories 2015-06-19 10:29:00 -04:00
Chris Meyers 39e508373f Merge pull request #288 from chrismeyersfsu/fix-workload_generator 
works with scan -> inventory link
 2015-06-19 09:26:04 -04:00
Chris Meyers 8381d7dbfa Merge pull request #286 from chrismeyersfsu/fix-license_expire_vs_existance 
Differentiate between an expired license and a non-existant license
 2015-06-19 09:25:27 -04:00
Chris Meyers 096ca10a1a works with scan -> inventory link 2015-06-19 08:23:17 -04:00
Chris Meyers d2a555b752 non-celery invocations (command-line invocations) do not update the inventory_update object after completion 2015-06-17 12:36:07 -04:00
Chris Meyers 760dc7ad9c Merge pull request #287 from chrismeyersfsu/fix-fact_tests 
create enterprise license file for fact api tests
 2015-06-17 11:46:51 -04:00
Chris Meyers 2b2126d8e1 create enterprise license file for fact api tests 2015-06-17 10:50:56 -04:00
Chris Meyers 11620f1a2c Merge pull request #279 from chrismeyersfsu/fix-docker_ssh 
added ssh to docker env
 2015-06-17 09:09:26 -04:00
Chris Meyers e495f07bb6 Merge pull request #285 from chrismeyersfsu/fix-fact_tests 
fix fact cache reciever unit tests to use inventory_id in message
 2015-06-17 09:09:16 -04:00
Chris Meyers fcc789f13b Differentiate between an expired license and a non-existant license 2015-06-16 15:59:23 -04:00
Chris Meyers 686312a427 fix fact cache reciever unit tests to use inventory_id in message 2015-06-16 13:11:09 -04:00
Chris Meyers c7e2c333d4 Merge pull request #283 from chrismeyersfsu/feature-age_deleted 
Added age_deleted command for support team
 2015-06-15 18:14:45 -04:00
Chris Meyers c076ba1669 flake8 2015-06-15 16:56:12 -04:00
Chris Meyers 8e3b33ee21 Added age_deleted command for support team 2015-06-15 16:06:54 -04:00
Chris Meyers 6a73b34791 Merge pull request #282 from chrismeyersfsu/fix-cleanup_deleted 
Replaced crafty logic that tried to detect the User but, wrongfully, …
 2015-06-15 13:35:11 -04:00
Chris Meyers 87824fa240 Replaced crafty logic that tried to detect the User but, wrongfully, matched Credential with explicit logic that, when cleaning up the User model, searches for the _del_ string in the username attribute. 2015-06-15 10:20:15 -04:00
Chris Meyers 26f5122179 expose ssh via 2222 2015-06-12 11:46:29 -04:00
Chris Meyers 7ba6445898 added ssh to docker env 2015-06-12 11:39:30 -04:00
Chris Meyers d5b7be3f4f Merge pull request #276 from chrismeyersfsu/fix-fact_inventory_relationship 
associate scan runs with a particular inventory host
 2015-06-11 20:55:13 -04:00
Chris Meyers 0c7638bdd7 associate scan runs with a particular inventory host 2015-06-11 15:14:00 -04:00
Chris Meyers f06c7e17f5 Merge pull request #273 from chrismeyersfsu/fix-job_launch_credential_permissions 
restrict the set of valid, explicitly supplied credentials to be ones readable by the user
 2015-06-10 08:37:25 -04:00
Chris Meyers 3b67a24057 Merge pull request #271 from chrismeyersfsu/fix-license_2 
allow config endpoint to posted to without license data
 2015-06-09 10:24:09 -04:00
Chris Meyers df57f45baa Merge branch 'master' into fix-job_launch_credential_permissions 2015-06-08 14:40:50 -04:00
Chris Meyers 9f48f127db Merge branch 'master' into fix-license_2 2015-06-08 14:40:19 -04:00