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
13,428 Commits 65 Branches 102 Tags
99834a85523bc8f86f860990b47d81b4a4f7c69d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Rominger 99834a8552 Merge pull request #6920 from AlanCoding/6873 
Prevent server error in POST to group hosts
 2017-07-07 09:26:53 -04:00
Alan Rominger 447624fd47 Merge pull request #6919 from AlanCoding/ask_vault 
include vault_credentials in ask_for_passwords and launch summary
 2017-07-07 09:25:11 -04:00
AlanCoding 0a339ed05c prevent server error in POST to group hosts 2017-07-07 08:24:50 -04:00
AlanCoding a2e88a9cdf include vault_credentials in passwords and launch summary 2017-07-07 07:57:34 -04:00
Alan Rominger 9a4701fe30 Merge pull request #6897 from ansible/AlanCoding-patch-2 
fix flake8 error from removal of word Tower
 2017-07-06 10:48:50 -04:00
Alan Rominger c7fddc7ae7 fix flake8 error from removal of word Tower 2017-07-06 10:39:24 -04:00
Alan Rominger 62f3803bcf Merge pull request #6851 from AlanCoding/isolated_timeouts 
Configurable isolated timeout & management playbook logfile
 2017-07-05 11:56:05 -04:00
AlanCoding 70b1b9c81d isolated connection timeout and log file for playbook out 2017-07-05 08:48:01 -04:00
Alan Rominger 34af7566ce Merge pull request #6759 from AlanCoding/naming_preflights 
Add inventory file consistency checks as new preflight
 2017-06-29 18:52:35 -04:00
Alan Rominger 6d85c8bc9f Merge pull request #6710 from AlanCoding/access_registry 
Automatically register access classes, don't put into lists
 2017-06-29 15:32:05 -04:00
AlanCoding ad4a7fe033 access_registry made simple dict with auto registration 2017-06-29 15:17:37 -04:00
Alan Rominger ec773f57d9 Merge pull request #6808 from ansible/AlanCoding-patch-2 
Remove extra_hosts that breaks dev environment
 2017-06-29 15:09:11 -04:00
Alan Rominger 9fda4eee85 Remove extra_hosts that breaks dev environment 
This was triggered by a docker update, and an empty value of DOCKER_HOST_IP resulted in an error running `make docker-compose`
 2017-06-29 13:41:33 -04:00
Alan Rominger 68103f2d72 Merge pull request #6720 from AlanCoding/scm_inv_update_resp 
Accuracy edit for inventory update response when updating project
 2017-06-29 11:45:50 -04:00
Alan Rominger 724a33c945 Merge pull request #6712 from AlanCoding/host_sublist 
Optimize inventory hosts sublist
 2017-06-29 11:35:37 -04:00
Alan Rominger 0d5157013a Merge pull request #6801 from AlanCoding/controlling_queues 
Add controlling queue list filter that was unintentionally dropped
 2017-06-29 11:16:51 -04:00
Alan Rominger fe959769eb Merge pull request #6738 from AlanCoding/do_nots 
Document name schemes you should never use
 2017-06-29 10:29:37 -04:00
Alan Rominger 607680a22b Merge pull request #6775 from AlanCoding/testing_fix 
Get logging test endpoint to work again
 2017-06-28 16:02:53 -04:00
AlanCoding c1ff41fa45 get logging test endpoint to work again 
The handler and formatter classes are expecting an object
and the previous method passed a dict, so this change converts
the data into a mock settings object.
 2017-06-28 15:10:18 -04:00
Alan Rominger 7d283f1dfd Merge pull request #6764 from AlanCoding/management_json_bug 
Fix bug where isolated management jobs could not load JSON output
 2017-06-28 11:52:22 -04:00
AlanCoding 05bcd4b674 fix bug where isolated management jobs could not load JSON output 2017-06-28 11:41:30 -04:00
Alan Rominger 79e71d77a1 Merge pull request #6727 from AlanCoding/delegate_registration 
Move isolated registrations to the isolated role
 2017-06-28 09:45:25 -04:00
Alan Rominger 70c11879a4 Merge pull request #6698 from AlanCoding/6690 
Do not show related link if null
 2017-06-27 16:03:33 -04:00
AlanCoding e4fa060cf2 document namings you should never use 2017-06-26 13:54:36 -04:00
Alan Rominger 7699e26336 Merge pull request #6722 from AlanCoding/atomic_inv_del 
use atomic transaction to delete inventory in task
 2017-06-26 11:07:21 -04:00
AlanCoding cf751568b5 use atomic transaction to delete inventory in task 2017-06-26 10:46:58 -04:00
AlanCoding 4298d60679 fix bug in response of inventory update with update_on_project_update 2017-06-26 09:48:01 -04:00
AlanCoding fc59a97e44 cache view parent obj & add prefetch to sublists 2017-06-24 20:13:31 -04:00
AlanCoding 066dc4a5f0 Separate Inventory Source API vs RBAC testing 
Introduced new decorator for patching an access method,
does legwork of inserting into access registry so that
tests that test the API can mock RBAC behavior.
 2017-06-23 15:31:59 -04:00
AlanCoding 17c431c0be do not show related link if null 2017-06-23 08:27:58 -04:00
Alan Rominger 30ec070357 Merge pull request #6692 from AlanCoding/manual_locations 
Tag jobs started via special cases with node & group
 2017-06-22 16:42:17 -04:00
AlanCoding 9e07b3f777 Tag jobs started via special cases with node & group 2017-06-22 16:24:12 -04:00
Alan Rominger 04ca47ffab Merge pull request #6681 from AlanCoding/cluster_instances 
New Alpha, Bravo, and Charlie instance groups for `make docker-compose-cluster`
 2017-06-22 15:00:45 -04:00
Alan Rominger 8f254dbd82 Merge pull request #6675 from AlanCoding/controller_id_sf 
add isolated job controller_id to summary fields
 2017-06-22 10:44:53 -04:00
AlanCoding 3cedcf22a9 add instance groups and queues to cluster tooling 2017-06-22 10:40:58 -04:00
Alan Rominger 20f0a83bec Merge pull request #6682 from AlanCoding/isolated_execution 
Have execution_node reflect isolated instance
 2017-06-22 10:12:21 -04:00
AlanCoding ea51c03c83 have execution_node reflect isolated instance 2017-06-22 08:57:07 -04:00
AlanCoding f62f0ca1e6 add isolated job controller_id to summary fields 2017-06-21 16:29:06 -04:00
Alan Rominger 2beb4e8885 Merge pull request #6673 from AlanCoding/iso_cap_select 
Select isolated node inside of queue based on capacity
 2017-06-21 16:03:06 -04:00
AlanCoding d69b4e00ff select isolated node inside of queue based on capacity 2017-06-21 15:48:23 -04:00
Alan Rominger 72cf434c2e Merge pull request #6669 from AlanCoding/tower_controller_fix 
fix bug that blocks tower controller groups
 2017-06-21 14:35:59 -04:00
Alan Rominger 8bec16c1b0 Merge pull request #6649 from ansible/AlanCoding-patch-2 
Update developer documentation for isolated jobs
 2017-06-20 17:28:15 -04:00
Alan Rominger 2c92f623d8 Merge pull request #6617 from ansible/isolated_setup 
setup playbook and heartbeat for isolated deployments
 2017-06-20 17:20:53 -04:00
Alan Rominger b9ecc775dc Update developer documentation for isolated jobs 2017-06-20 15:09:45 -04:00
AlanCoding 40287d8e78 multi-host isolated heartbeat w tower-isolated check 
* use tower-expect command to determine job status when running
  the isolated heartbeat playbook
* grok JSON output of playbook to obtain result information
* run playbook against multiple isolated hosts at the same time
  (addresses scalability concerns)
 2017-06-20 14:36:18 -04:00
AlanCoding f371dd71b2 Run isolated heartbeat against all hosts at once 
Previously we were running the playbook on a host-by-host
basis, but this changes it to pass in the list of all
isolated isntances the machine is responsible for.
Using the `json` Ansible stdout module, we are able to
parse the output for information on each host.
 2017-06-19 12:13:36 -04:00
AlanCoding 7eb8fdd0f1 Change use of subprocess lib for calculating system capacity 
Suggested by Ryan Petrello as a part of the PR feedback
for the isolated instance setup work.
 2017-06-19 12:13:36 -04:00
AlanCoding 1d9f2be0e4 add task in isolated heartbeat to delete rogue files 2017-06-19 12:13:36 -04:00
AlanCoding dd1a261bc3 setup playbook and heartbeat for isolated deployments 
* Allow isolated_group_ use in setup playbook
* Tweaks to host/queue registration commands complementing setup
* Create isolated heartbeat task and check capacity
* Add content about isolated instances to acceptance docs
 2017-06-19 12:13:36 -04:00
Alan Rominger c0923729e2 Merge pull request #6386 from ansible/AlanCoding-patch-1 
root folder re-creation on project sync
 2017-06-13 12:10:35 -04:00
Alan Rominger f0ca47b4fd root folder re-creation on project sync 2017-06-12 09:51:08 -04:00
Alan Rominger a1963024c6 Merge pull request #6378 from AlanCoding/queue_cmd_help 
Gracefully handle certain instance group tower-manage scenarios
 2017-05-30 16:30:11 -04:00
AlanCoding 198b3f0a94 handle user corner cases related to instance group commands 2017-05-30 15:49:48 -04:00
Alan Rominger 430852b73d Merge pull request #6271 from AlanCoding/wfj_no_node 
Remove `execution_node` from WFJ serializer
 2017-05-16 14:44:50 -04:00
AlanCoding 2cbb2c6d53 remove execution_node from WFJ serializer 2017-05-16 12:31:29 -04:00
Alan Rominger 22249b2625 Merge pull request #6266 from AlanCoding/ig_ordering 
Instance group preference order consistent with docs
 2017-05-15 16:34:18 -04:00
Alan Rominger 422ff33f5a Merge pull request #6260 from AlanCoding/IG_meeting_words 
Add docs from Instance Groups acceptance meeting
 2017-05-15 16:33:22 -04:00
AlanCoding fbf24492d8 Instance group preference order consistent with docs 2017-05-15 15:45:10 -04:00
Alan Rominger 537e046815 Merge pull request #6265 from AlanCoding/IU_dep_type 
dependent IU launch_type reduced to 'dependency'
 2017-05-15 14:37:15 -04:00
Alan Rominger 4d33197598 Merge pull request #6263 from AlanCoding/ret_TG 
Return template_groups when set on UJT
 2017-05-15 14:36:57 -04:00
AlanCoding 901c77bcfb dependent IU launch_type reduced to 'dependency' 2017-05-15 14:24:41 -04:00
AlanCoding 05cecbf0e6 Return template_groups when set on UJT 2017-05-15 13:12:21 -04:00
AlanCoding b41f4de4e5 Add docs from Instance Groups acceptance meeting 2017-05-15 10:16:47 -04:00
Alan Rominger 5f3aad4972 Merge pull request #6256 from AlanCoding/relaunch_extra_creds 
Job relaunch refactor to accommodate new credential system
 2017-05-12 17:24:16 -04:00
Alan Rominger d22618aa09 Merge pull request #6247 from AlanCoding/extra_credit 
JT RBAC edits for extra_credentials and vault_credential
 2017-05-12 17:23:26 -04:00
AlanCoding 048804f48e Job relaunch refactor to accomidate new credential system 
* make user_capability for 'start' more simple
* provide error messages if relaunch not possible
* check for prompted extra_credentials
* add extra_credentials permission checks in orphan mode
 2017-05-12 17:16:06 -04:00
AlanCoding c6a3a7cc34 JT RBAC edits for extra_credentials and vault_credential 2017-05-12 17:13:58 -04:00
Alan Rominger f7f27e94d1 Merge pull request #6249 from AlanCoding/job_action_serializer 
Avoid re-building fields for cancel and relaunch endpoints
 2017-05-12 09:37:25 -04:00
AlanCoding 244ebecd16 avoid re-building fields for cancel and relaunch endpoints 2017-05-11 17:11:57 -04:00
Alan Rominger 7a1c6c6794 Merge pull request #6241 from AlanCoding/scm_inv_feedback 
SCM inventory acceptance and bug updates
 2017-05-11 16:30:26 -04:00
Alan Rominger bdde87f7f5 Merge pull request #6245 from AlanCoding/alan_rockin_ramparts 
Introduce view to allow associations but no creations
 2017-05-11 14:10:21 -04:00
AlanCoding 14b5ab984b new view to allow associations but no creations 2017-05-11 13:11:11 -04:00
AlanCoding 97ca6bc897 SCM inventory acceptance and bug updates 
* fixed a problem where the SCM last revision was not getting reset
* change the 400 editing error to just reset the last revision
* handle `source_vars` in the same way as custom scripts
* block unallowed `source_vars` in the validator
* hide POST in OPTIONS for inventory source sublist if not allowed
 2017-05-11 12:04:48 -04:00
Alan Rominger 2b15d04096 Merge pull request #6218 from AlanCoding/scm_inv_cancel 
SCM inventory cancel propagation
 2017-05-10 15:52:31 -04:00
AlanCoding fc590535be update inventory file list on every project update 2017-05-10 15:34:31 -04:00
AlanCoding 04d6fb1f95 SCM inventory cancel propagation 
For manually initiated inventory updates, also cancel the source
project of "sync" type, like jobs do

For automatic inventory updates spawned from source project update,
of launch type "scm", handle contigency cases
 2017-05-10 10:28:49 -04:00
Alan Rominger f954507a8c Merge pull request #6186 from AlanCoding/scm_inv_stability 
SCM Inventory task system and variables stability edits
 2017-05-08 14:31:58 -04:00
AlanCoding 890b5bba58 SCM Inventory task system and variables stability edits 
* Ensure "fresh bits" in dependent jobs
  - run IUs in same context and dependent PU
  - review docs for update-on-launch expectations
* Avoid customer variable precedence upgrade issues
  - only allow SCM types to have overwrite_vars=true
  - do not run other cloud sources through the backported script
* Make extra sure to echo stdout and stderr in event of error
 2017-05-08 09:43:11 -04:00
Alan Rominger 257dc459cf Merge pull request #6179 from AlanCoding/name_changes 
SCM Inventory field name changes
 2017-05-04 11:17:21 -04:00
AlanCoding 35ae13f498 fully link up source_project_update to inventory update 2017-05-04 11:08:05 -04:00
AlanCoding d826c45ac6 SCM Inventory field name changes 
on InventorySource model
* scm_project -> source_project
on InventorySourceSerializer
* scm_inventories -> scm_inventory_sources

on InventoryUpdate model
* scm_project_update -> source_project_update
 2017-05-04 09:15:29 -04:00
Alan Rominger a9c7822a4d Merge pull request #6176 from AlanCoding/inv_src_as 
link inventory source activity stream to right place
 2017-05-03 17:00:26 -04:00
AlanCoding 4735358857 link inventory source activity stream to right place 2017-05-03 16:31:21 -04:00
Alan Rominger 24a04d56f1 Merge pull request #6135 from AlanCoding/scm_bifurcation 
Allow management of 2 types of SCM inventory sources
 2017-05-03 16:03:11 -04:00
AlanCoding 3243110496 connect CredentialType to activity stream 2017-05-03 13:53:11 -04:00
AlanCoding 12ab3a0ae9 managed_by_tower restriction now in validation, not access 2017-05-03 13:53:06 -04:00
AlanCoding 8d2598beee allow management of 2 types of SCM inventory sources 2017-05-03 12:18:08 -04:00
Alan Rominger 84b8dcece0 Merge pull request #6120 from AlanCoding/ansible-inventory 
Inventory updates through `ansible-inventory`
 2017-05-02 16:19:58 -04:00
AlanCoding 2f62182940 refactor inventory Loaders for ansible-inventory 
* remove support for loading from executable and static files
* instead use ansible-inventory with fallback to backport
* provide private file dir in task manager for cred injection
* durable management of tmp dirs for user scripts

* new 'scm' source choice for scm-type
* update SCM inventory docs to new reality
 2017-05-01 14:37:43 -04:00
AlanCoding a92c7cec7d remove code to parse inventory files 2017-05-01 14:37:42 -04:00
AlanCoding 8e6020436c modularization of inventory_import command 
This separates file parsing logic that was mixed
in with other important code inside of the
inventory import command.

The logic around MemObject data structures was
moved to utils, and the file parsing was moved
to a legacy module. As of this commit, that
module can operate within the Tower environment
but it will be removed.

Also refactor the loggers to fix old bug and
work inside of the different contexts - the
Loader classes, mem objects, and hopefully
the inventory modules eventually.
 2017-05-01 14:37:42 -04:00
AlanCoding ef01fea89c purge of inventory file syntax testing 
* remove use of temporary files in inventory import
* remove old inventory import tests
* remove supporting example inventory files

This type of testing has been migrated to the backport
repository because it will be handled by the inventory module.
From here on out, no inventory syntax testing will be
maintained inside of the Ansible Tower repo.
 2017-05-01 14:37:42 -04:00
AlanCoding 2488dabca6 add ansible-inventory backport from upstream 
This is a separately maintained repo
https://github.com/ansible/ansible-inventory-backport
tests and compatibility is managed in that location
 2017-05-01 14:37:42 -04:00
Alan Rominger dd8f8c169c Merge pull request #6139 from AlanCoding/mock_message_313 
mock message obect in callback receiver test
 2017-05-01 10:38:28 -04:00
AlanCoding 481df1fcf8 mock message obect in callback receiver test 2017-05-01 10:17:49 -04:00
AlanCoding 0246b6bdcd bump migration versions after 313 merge 2017-04-28 14:40:08 -04:00
Alan Rominger 0e2bf3486a Merge pull request #6123 from AlanCoding/allow_templated_ct 
Make Credential Type validator aware of `tower` var
 2017-04-28 09:23:51 -04:00
AlanCoding 1169d19f8c Make Credential Type validator aware of "tower" var 2017-04-28 07:56:49 -04:00
Alan Rominger e1a96092fc Merge pull request #6094 from ansible/AlanCoding-patch-2-1 
Fix 500 error in ProjectScmInventorySources
 2017-04-25 10:10:48 -04:00
Alan Rominger 34b697ce17 Fix 500 error in ProjectScmInventorySources 2017-04-24 16:54:17 -04:00