External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-13 15:25:02 -02:30
Code Issues Packages Projects Releases Wiki Activity
12,254 Commits 64 Branches 102 Tags
81dea61ba99699fd5f7f4baf5f4e4012cc12a2d3
Commit Graph
96 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones be7c1ff2e7 Merge pull request #5872 from samdoran/firewall-role-improvements 
Improve firewall role so it does not report failures
 2017-04-04 13:48:53 -04:00
Matthew Jones bc4174adf8 Ignore .retry files for project updates 2017-03-14 13:23:14 -04:00
Matthew Jones 3510954254 Merge pull request #5703 from ansible/cloudforms_licensing 
Implement cloudforms license
 2017-03-13 16:16:21 -04:00
Matthew Jones 2641b2a1c3 Implement cloudforms license 
This is a special license that is triggered in the presence of two
directories:
  - /opt/rh/cfme-appliance
  - /opt/rh/cfme-gemset
and the rpms
  - cfme
  - cfme-appliance
  - cfme-gemset

All of which I'm assured are responsible for validating that this is
indeed an enterprise cloudforms environment.

When these are present then a license is used that is near perpetual,
allows for a stupid large number of instances, and turns on all features
 2017-03-13 12:00:22 -04:00
Matthew Jones 5060ed4033 Merge pull request #5684 from samdoran/nginx-template-formatting 
Enable lstrip_blocks in nginx.conf template
 2017-03-10 10:25:21 -05:00
Matthew Jones a1fce99e67 Merge branch 'stable' into devel 2017-03-08 15:35:09 -05:00
Matthew Jones 1a946d51c1 Fix an issue with sync vs run project updates 
We need to not remove the source tree on project update run which
happens in the context of the job run to prevent the directory from
being deleted out from under the job runners. Since those will
inherently not block each other as the project update would
 2017-02-24 11:03:48 -05:00
Matthew Jones 819d8d1fb3 Show the data that would have been a problem sending payload 
for websocket
 2017-02-08 11:30:15 -05:00
Matthew Jones 4ed054f568 Implement optional message persistence on callback events 2017-02-08 11:11:14 -05:00
Matthew Jones a544e322fd Merge pull request #5080 from ansible/generate_stdout_files 
Generate stdout files from job events
 2017-01-31 14:46:30 -05:00
Matthew Jones 5362ee049b Merge pull request #5048 from ansible/we_got_the_beat_yeeeah 
Split celery beat into its own worker for prod
 2017-01-30 16:45:57 -05:00
Matthew Jones ef51ee989d Merge pull request #5012 from ansible/pu_iu_stdout_handling 
Store project update and inventory update stdout in the database
 2017-01-30 11:20:32 -05:00
Matthew Jones cf084850c2 Merge pull request #4960 from ansible/priv_esc_hangs 
Fixes some issues where Tower would not emit the password on prompts
 2017-01-27 09:51:57 -05:00
Matthew Jones 90caa2fbb7 Merge pull request #4961 from ansible/purge_old_events_endpoints 
These old endpoints are hacky, ugly, and no longer used
 2017-01-26 14:33:19 -05:00
Matthew Jones 986ddae33e Merge pull request #4882 from matburt/cache_behavior_fixes 
Fixes for data corruption/exception in cache usage
 2017-01-24 11:12:28 -05:00
Matthew Jones 8e2342b7c2 Merge pull request #4881 from matburt/nginx_alt_port 
Implement alternate ports for nginx
 2017-01-23 16:16:51 -05:00
Matthew Jones e8c7db930f Merge pull request #4641 from ansible/multi_worker_callbacks 
Implement a worker-based callback receiver system
 2017-01-18 20:45:45 -05:00
Matthew Jones 7ca496b6ef Merge branch 'release_3.1.0' into multi_worker_callbacks 2017-01-18 20:39:15 -05:00
Matthew Jones 5f0940e411 Merge pull request #4461 from cchurch/ansi-download 
Add ansi_download format for stdout
 2017-01-04 14:46:16 -05:00
Matthew Jones e83360592f Merge pull request #4391 from ansible/set_max_page_size 
Set an upper limit of 200 on the max page size
 2016-12-12 14:51:29 -05:00
Matthew Jones aa0139078f Merge pull request #4371 from wenottingham/cannot-think-of-a-good-branch-name-today 
Update project help for ConfigureTowerInTower.
 2016-12-12 10:26:26 -05:00
Matthew Jones a894ba4b57 Merge pull request #4310 from ansible/strings_updates 
Update help text strings
 2016-12-06 13:21:14 -05:00
Matthew Jones 20cb3cf7de Merge pull request #4224 from jangsutsr/4217_add_schedule_capability_to_wfjt_serializer 
Add schedule capability to wfjt serializer
 2016-12-04 21:06:06 -05:00
Matthew Jones cb2d90673d Merge pull request #4223 from jangsutsr/4043_add_help_text_to_wfjt_launch_endpoint 
Add help text to wfjt launch endpoint
 2016-12-04 21:05:47 -05:00
Matthew Jones 408c79a845 Merge pull request #4219 from sundeep-co-in/STAGE 
add django.pot
 2016-12-04 21:04:41 -05:00
Matthew Jones 95f3eacf25 Remove -e flags from requirements to fix build 
These cause some odd behavior with egg-info links
 2016-11-23 04:50:43 -05:00
Matthew Jones e725b16cd9 Change job-run project refresh launch type to "sync" 2016-11-22 09:33:25 -05:00
Matthew Jones 5df4096660 Make websocket events more informative 
* Make sure we always populate workflow information when relevant to
  job status changes.
* Include detail about workflow job node
 2016-11-22 09:33:25 -05:00
Matthew Jones cb82809f10 Merge pull request #3935 from jladdjr/at-3532-typo 
Minor typo fix (pointing workflow node template at unsupported unified job template)
 2016-11-18 15:45:34 -05:00
Matthew Jones b8db27bb39 Merge pull request #3910 from cchurch/azuread-oauth2 
Add AzureAD OAuth2 support.
 2016-11-18 11:28:04 -05:00
Matthew Jones 0fa4600f79 Merge pull request #3864 from wwitzel3/websocket-docs 
added some documentation about channels/websockets
 2016-11-07 10:06:56 -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 e999803d3a Merge pull request #3837 from wwitzel3/playbook-httpd-fix 
remove httpd process stop check
 2016-11-02 14:42:08 -04:00
Matthew Jones ef77038d52 Merge pull request #3844 from ansible/AlanCoding-patch-5 
flake8
 2016-11-02 14:39:47 -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
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
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
Matthew Jones e77b9b877a Merge pull request #3710 from wwitzel3/release_3.0.3 
filter internal User.admin_roles from the /roles API list view
 2016-10-20 13:45:25 -04:00
Matthew Jones f3a8eb9daf Merge pull request #3509 from ansible/ha_installer 
Improvements to the setup/installer to support new HA workflows
 2016-09-16 15:53:38 -04:00
Matthew Jones ce2aaef086 Merge pull request #3200 from wenottingham/devel 
Add a check for recent enough Ansible.
 2016-09-13 09:50:00 -04:00
Matthew Jones b1b9967be0 Merge pull request #3220 from nitzmahone/req_update 
update requirements versions for requests,azure
 2016-09-13 09:48:31 -04:00
Matthew Jones 59aed7b318 Merge pull request #3343 from ansible/ramparts_and_ha 
New Development Environment Workflow && Replacing Redis with qpid/memcached
 2016-08-26 09:34:19 -04:00
Matthew Jones 965827ca4e Merge pull request #3318 from ansible/revert-3244-3199_ignored_task_result_inconsistent 
Revert "Prevent ignored task from being displayed as failing."
 2016-08-22 13:37:15 -04:00
Matthew Jones e40a482cc9 Merge pull request #3317 from ansible/revert-3307-3199_2_change_job_event_save_behavior 
Revert "Modify job event save behavior"
 2016-08-22 13:37:04 -04:00
Matthew Jones 6cf567e4fd Revert "Prevent ignored task from being displayed as failing." 2016-08-22 13:34:52 -04:00
Matthew Jones 16fce59512 Revert "Modify job event save behavior" 2016-08-22 13:34:08 -04:00
Matthew Jones 81447df1b1 Merge pull request #3309 from jakemcdermott/bug-3308 
update setup.sh option parser such that -r doesn't expect an argument
 2016-08-22 11:44:19 -04:00
Matthew Jones 17a27ef4a2 Merge pull request #3005 from matburt/delete_protection 
Add delete protection from certain objects
 2016-07-14 12:52:58 -05:00
Matthew Jones 50816d4d67 Merge pull request #2507 from AlanCoding/NT_flake8 
Fix flake8
 2016-06-17 15:15:31 -05:00
Matthew Jones 97e980a258 Merge pull request #2182 from wenottingham/no-more-munin 
munin is dead. Long live munin!
 2016-06-07 13:48:58 -05:00
Matthew Jones 260a06d711 Merge pull request #2147 from matburt/expose_external_accounts 
Expose any external account as a user property
 2016-06-03 09:42:07 -05:00
Matthew Jones 31f05a45cd Merge pull request #1971 from matburt/job_stdout_backup 
Add backup and restore tasks for job stdout
 2016-05-19 11:17:10 -04:00
Matthew Jones a64b0a735c Merge pull request #1820 from matburt/refactor_notification_endpoint_names 
Refactor Notification's naming
 2016-05-05 14:42:47 -04:00
Matthew Jones eb714ce67f Merge pull request #1777 from matburt/ad_hoc_extra_vars 
Implement extra vars on ad-hoc commands
 2016-05-03 14:35:19 -04:00
Matthew Jones da7a61354a Merge pull request #1635 from matburt/new_azure_inventory_and_credentials 
Implement Azure RM creds and inventory
 2016-04-21 14:38:13 -04:00
Matthew Jones 29875a428b Merge pull request #1558 from matburt/demo_data 
Creating pre-loaded demo data
 2016-04-18 13:54:40 -04:00
Matthew Jones 60039b6e40 Merge pull request #1200 from matburt/python27_el6 
Changes for Tower virtualenv support
 2016-03-09 14:57:51 -05:00
Matthew Jones a2cf365325 Merge pull request #804 from cchurch/allow-null-or-blank-for-project-booleans 
Allow null/blank input for boolean fields on projects.
 2016-02-05 09:55:15 -05:00
Matthew Jones b8dfa3df16 Merge pull request #803 from cchurch/remove-fields-for-ad-hoc-commands 
Remove unified_job_template and description fields for ad hoc commands
 2016-02-05 09:55:06 -05:00
Matthew Jones 38b1d13edc Merge pull request #802 from cchurch/metadata-check-if-view-has-serializer 
Check if view has a get_serializer method before trying to call it.
 2016-02-05 09:54:59 -05:00
Matthew Jones a20fa59b9c Merge pull request #801 from cchurch/include-api-css-js 
Include api.css and api.js under awx/static/.
 2016-02-05 09:54:48 -05:00
Matthew Jones e890f23d00 Merge pull request #799 from cchurch/quick-fix-select-related 
Quick fix for select related error with unified job templates and jobs
 2016-02-05 09:54:37 -05:00
Matthew Jones 71cd77c3e0 Merge pull request #798 from cchurch/fix-792 
Don't show playbooks under project detail.
 2016-02-05 09:54:26 -05:00
Matthew Jones 72d3d093ed Merge pull request #753 from ansible/jag/fix-nostatsclient 
Fix to NoStatsClient in callback plugin
 2016-01-29 14:43:16 -05:00
Matthew Jones 16a0d8b45d Merge pull request #710 from ansible/jag/dumb-init 
Use dumb-init to manage processes in docker containers
 2016-01-29 10:15:00 -05:00
Matthew Jones af65a88a0f Merge pull request #707 from ansible/jag/statsd 
Add optional statsd metrics gathering
 2016-01-29 09:59:01 -05:00
Matthew Jones 296ca52b0f Merge pull request #661 from matburt/651_fix_rax_cache_behavior 
Fix for rax cache timeout issue
 2016-01-25 20:40:19 -05:00
Matthew Jones 2a547865ba Merge pull request #623 from matburt/622_v2_playbook_on_start_fix 
Fix v2 playbook_on_start method signature
 2016-01-14 12:25:17 -05:00
Matthew Jones 0feb41751a Merge pull request #609 from matburt/603-fix_rhel5_scan_jobs 
Fix old python support in scan_services
 2016-01-12 15:49:54 -05:00
Matthew Jones 84c2e71907 Merge pull request #541 from matburt/database_config_source 
Database config source
 2016-01-12 11:20:43 -05:00
Matthew Jones 63a2299dd2 Merge pull request #533 from cchurch/cache_ldap_user_groups 
Prefetch LDAP user groups to reduce queries for checking group membership
 2015-12-16 11:28:30 -05:00
Matthew Jones a6b2e25680 Merge pull request #483 from ansible/license_warning_and_auth_license_validation 
Add logging and improve validation for certain auth backends
 2015-11-03 09:54:45 -05:00
Matthew Jones 3b961cf4f2 Merge pull request #466 from matburt/use_waitfor_not_sleep 
Switch to using wait_for instead of sleep/pause throughout the setup playbook
 2015-10-07 15:53:18 -04:00
Matthew Jones 0fdb5e035c Merge pull request #460 from matburt/improve_mongo_efficiency 
Improve mongo efficiency
 2015-10-02 16:56:36 -04:00
Matthew Jones 0e0037b7f8 Merge pull request #451 from matburt/iam_ephemeral_cred 
Support IAM ephemeral cred
 2015-10-01 10:59:10 -04:00
Matthew Jones 4ca29c4adf Merge pull request #453 from matburt/fix_proot_cp_issue 
Fix proot controlpersist cleanup issue
 2015-10-01 09:38:22 -04:00
Matthew Jones c039ec197f Merge pull request #442 from matburt/qa_joblaunch_delay 
Add a sleep step to job runs if configured
 2015-09-29 12:17:23 -04:00
Matthew Jones 53a96fd9eb Merge pull request #440 from matburt/pendo_apiside 
API Side Pendo Tracking Work
 2015-09-29 01:04:21 -04:00
Matthew Jones 30d88b1829 Merge pull request #439 from matburt/backup_ui_customizations 
Backup customized ui files
 2015-09-24 22:36:31 -04:00
Matthew Jones 9859ac3754 Merge pull request #429 from matburt/migrate_to_default_schedules 
Add some default schedules for cleanup jobs
 2015-09-22 11:29:15 -04:00
Matthew Jones 7d2eec0974 Merge pull request #385 from AlanCoding/devel 
add whitespace in API responses about survey rejection
 2015-08-28 17:06:54 -04:00
Matthew Jones 43491721b6 Fix issue AC-1008... not checking license expiration when running import inventory 2014-02-21 11:40:04 -05:00
Matthew Jones a6a1a6504a Check for anonymous user in the activity stream middleware and don't 
attempt to attach user information to the event
 2014-02-21 11:09:03 -05:00
Matthew Jones 00676c95e0 Change zmq socket characterstics to ack response. Fix up unit tests 2014-02-21 10:40:53 -05:00
Matthew Jones 3231f966db More small cleanup for zeromq work. Switch back to single-path 
writing of job events
 2014-02-19 13:57:13 -05:00
Matthew Jones 94e0d9ab1d Remove an unneeded print statement 2014-02-18 23:09:07 -05:00
Matthew Jones 28a1f64d54 Implement a signal handler on the callback receiver. Use the full 
receiver when running unit tests
 2014-02-18 23:01:55 -05:00
Matthew Jones 398d7633d3 Fix some issues starting the callback receiver workers 2014-02-18 19:13:36 -05:00
Matthew Jones 155837ebbb Update dev requirements to mention zeromq dependency 2014-02-18 15:22:49 -05:00
Matthew Jones 2a65fbe77c Update contributing documentation and add receiver target to Makefile 2014-02-18 15:16:39 -05:00
Matthew Jones 570f53e62c Merge remote-tracking branch 'origin/zeromq' 
* origin/zeromq:
  Update supervisor configuration during deployment to allow pulling in zeromq based dependencies and so that the new callback handler will get started alongside celery
  Update unit tests to manage zeromq based tasks
  Cleanup and refactor some parts of thew new zeromq based callback receiver
  Update playbook to install zeromq3 and the dependent python module
  Some cleanup and documentation for zeromq implementation
  Pull results off zeromq and distribute to workers
  Manage the zeromq connection per-pid
  Initial 0mq implementation
 2014-02-18 14:15:57 -05:00
Matthew Jones d3ea140baf Merge remote-tracking branch 'origin/master' into zeromq 
* origin/master: (36 commits)
  AC-564 fixed a bug with CodeMirror editor and post dialog removal/cleanup.
  AC-564 fixed a bug with CodeMirror editor and post dialog removal/cleanup.
  AC-564 added new method to codemirror wrapper to enable replacing textarea fields with an editor. Implemented in inventory, groups, hosts, and templates. Solved issues with groups related to two potential textareas at the same time. Found and fixed an error in the way ReturnToCaller() utility was being called. Finished implementing angular-md5. Adding or saving a job template now shows a pop-up on save when a callback is enabled. The pop-up shows the callback url and host key. Before user had to save and then re-open the template to get the URL. With the pop-up we're now showing it immmediately on save.
  AC-564 added new method to codemirror wrapper to enable replacing textarea fields with an editor. Implemented in inventory, groups, hosts, and templates. Solved issues with groups related to two potential textareas at the same time. Found and fixed an error in the way ReturnToCaller() utility was being called. Finished implementing angular-md5. Adding or saving a job template now shows a pop-up on save when a callback is enabled. The pop-up shows the callback url and host key. Before user had to save and then re-open the template to get the URL. With the pop-up we're now showing it immmediately on save.
  Fixed broken links where ngHref is used in list objects.
  Fixed js error post host edit save.
  Fixed menu bar height. After TB upgrade it was fixed at 50px. Moved back to 0 and let image height be dominant. Pulled in angular-codemirror overlay fix.
  Install add-apt-repository during AMI build
  Assume yes when adding PPA
  UUID will always be random
  Don't forget to install the PPA
  Fixed twiter js package. Now repo includes dist subdir.
  Fixing twitter js library
  Update to latest ubuntu-12.04 base AMI
  Include awx.min.js in sdist packaging
  Add 'npm install' task to the make process
  AC-564 implemented angular-codemirror to provide JSON/YAML syntax highlighting and linting in a full-screen editor.
  Fix issue AC-977 by including job_template in summary fields for job activity stream events
  Fixed a bug in Groups.js helper that blocked GroupsEdit, so you couldn't edit an existing group. Issue was Angular depenedency ineject was misaligned with function parameters.
  AC-725 Added tower version to app footer and license dialog. Refactored license dialog to use tabs rather than accordions. Fixed conflict between angular routes and TB tabs.
  ...
 2014-02-18 14:04:51 -05:00
Matthew Jones 11cfacd57a Update unit tests to manage zeromq based tasks 2014-02-18 13:54:56 -05:00
Matthew Jones f6870634c4 Cleanup and refactor some parts of thew new zeromq based callback receiver 2014-02-18 13:54:28 -05:00
Matthew Jones 2c694e5e07 Some cleanup and documentation for zeromq implementation 2014-02-17 11:11:48 -05:00