External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-20 06:01:25 -03:30
Code Issues Packages Projects Releases Wiki Activity
12,472 Commits 55 Branches 19 Tags
Commit Graph

12472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matthew Jones
8c7adddaf3 Merge branch 'release_3.1.3' into devel 
* release_3.1.3:
  create .lock file without needing the proj dir to exist
  work around a change in ansible 2.3 to `Task.get_name()`
  mock message obect in callback receiver test
 2017-05-01 14:35:11 -04:00
Chris Meyers
01c526dabd Merge pull request #6141 from chrismeyersfsu/fix-6137 
create .lock file without needing the proj dir to exist
 2017-05-01 11:51:36 -04:00
Chris Meyers
633da940a8 create .lock file without needing the proj dir to exist 
* We create <project_name>.lock file in the tower project root
directory. This should not require that the project directory exists,
only that the project directory name is generatable.
 2017-05-01 11:15:18 -04:00
Ryan Petrello
6870104811 Merge pull request #6140 from ryanpetrello/fix-ansible-23-setup-payload 
work around a change in ansible 2.3 to `Task.get_name()`
 2017-05-01 10:42:08 -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
Ryan Petrello
f6046d47c9 work around a change in ansible 2.3 to Task.get_name() 
Properly detect setup tasks so that we can filter out sensitive
variables from the `ansible_facts` portion of the event payload.
 2017-05-01 10:38:05 -04:00
AlanCoding
481df1fcf8 mock message obect in callback receiver test 2017-05-01 10:17:49 -04:00
jlmitch5
932f53b2ea Merge pull request #6090 from jlmitch5/credTypes 
add credential types to ui
 2017-04-28 17:10:00 -04:00
John Mitchell
879f98df2a updates to credential types forms and lists 2017-04-28 17:08:59 -04:00
John Mitchell
7f48da9114 fix toggle display based on greg's work 2017-04-28 17:08:18 -04:00
John Mitchell
3a5a9aac41 make select2 elements fit in their alloted space 2017-04-28 17:07:54 -04:00
Marliana Lara
4ef057c4ee Merge pull request #6131 from marshmalien/fix/autofillOrgInNotificationTemplate 
Autofill organization in a new notification template
 2017-04-28 16:22:55 -04:00
John Mitchell
3731c8b72f reduce options reqests and get requests further 2017-04-28 16:00:29 -04:00
John Mitchell
2b57027067 deduping options request and possibly fixing choices of undefined error 2017-04-28 16:00:29 -04:00
John Mitchell
38c0c0a89b add credential types to ui 2017-04-28 16:00:29 -04:00
Marliana Lara
7386ed694a Check if params object exists 2017-04-28 15:29:04 -04:00
Ryan Petrello
46bd02b4c6 Merge pull request #6126 from ryanpetrello/vault_credential_fk 
add a new `vault_credential` relationship to Job/JobTemplate
 2017-04-28 15:28:22 -04:00
Ryan Petrello
def2034883 add a new vault_credential relationship to Job/JobTemplate 
additionally, properly assign vault credentials to Jobs and JobTemplates
as they're migrated to the new split model

see: #5807
see: #5878
 2017-04-28 15:00:01 -04:00
AlanCoding
0246b6bdcd bump migration versions after 313 merge 2017-04-28 14:40:08 -04:00
Wayne Witzel III
64982461ac Merge pull request #6124 from wwitzel3/devel 
Add inventory_id to websocket data
 2017-04-28 14:02:40 -04:00
Matthew Jones
e1e83598e9 Merge branch 'release_3.1.3' into devel 
* release_3.1.3: (52 commits)
  ack fact scan messages
  making ldap user/group search fields into codemirror instances
  removing UI parsing for LDAP User and Group Search fields
  Allow exception view to accept all valid HTTP methods.
  Restore ability of parsing extra_vars string for provisioning callback.
  Fix up backup/restore role broken in f7a8e45809758322d9ee41c5305850dd70ed5faf
  Stop / start ansible-tower-service during restores
  value_to_python should encode lookup fields as ascii
  fix brace interpolation on standard out pane
  Adjust some hardcoded usages of 'awx' to use 'aw_user' and 'aw_group'.
  Pull Spanish updates from Zanata
  Temporarily grant awx user createdb role
  Stop giving ownership of backups to postgres
  don't display chunked lines'
  Add dropdown li truncation with ellipsis
  CTiT -> adhoc modules should allow the user to add new modules
  Remove task that was replacing the supervisor systemd tmp file
  Fix failing supervisorctl commands on RH-based distros
  Give ownership of the supervisor socket to awx
  Setting for external log emissions cert verification
  ...
 2017-04-28 13:57:04 -04:00
Chris Meyers
3c0d4bf134 Merge pull request #6132 from chrismeyersfsu/fix-ack_fact_scan_messages 
ack fact scan messages
 2017-04-28 13:49:09 -04:00
Chris Meyers
d14a55911b ack fact scan messages 
* Fixes a bug where fact rabbit messages would build up because we never
explicitly ack them.
 2017-04-28 13:46:54 -04:00
Marliana Lara
a7dbb78c2e Autofill organization in a new notification template 
Issue #2943
When navigating from an organization to a new
notification template, the organization field should automatically
populate the organization name.
 2017-04-28 13:42:00 -04:00
Wayne Witzel III
b651983045 also add inventory_source_id to websocket data 2017-04-28 12:22:49 -04:00
Wayne Witzel III
1248be9b7c Add inventory_id to websocket data 2017-04-28 11:50:07 -04:00
Ryan Petrello
987448c917 Merge pull request #6127 from ryanpetrello/reserved_tower_ns 
treat `tower` as a reserved field name for custom CredentialTypes
 2017-04-28 11:38:20 -04:00
Ryan Petrello
03460b311e treat tower as a reserved field name for custom CredentialTypes 2017-04-28 11:26:18 -04:00
Aaron Tan
89f239ce66 Merge pull request #6119 from jangsutsr/5658_enforce_org_dependency_of_notification_template 
Enforce org dependency of notification template
 2017-04-28 11:08:21 -04:00
Aaron Tan
d0d201863b Enforce org dependency of notification template. 2017-04-28 10:14:21 -04:00
Aaron Tan
77915423c2 Merge pull request #6122 from jangsutsr/6012_prevent_workflow_resources_from_returning_402_with_basic_license 
Prevent workflow resources from returning 402 with basic license
 2017-04-28 09:38:34 -04:00
Aaron Tan
209acc3278 Merge pull request #6121 from jangsutsr/6118_allow_drf_parser_to_accept_trailing_commas 
Allow DRF parser to accept trailing commas
 2017-04-28 09:37:23 -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
Aaron Tan
0dc6bbe5a0 Prevent workflow resources from returning 402 with basic license. 2017-04-27 16:50:16 -04:00
Aaron Tan
c2d26c918a Allow DRF parser to accept trailing commas. 2017-04-27 16:16:05 -04:00
Marliana Lara
25fae0eafd Merge pull request #6112 from marshmalien/fix/addTooltipToJobsPanel 
Add tooltip to Job Panel status dots
 2017-04-26 16:21:21 -04:00
Marliana Lara
9189252724 Add tooltip to Job Panel status dots 2017-04-26 15:25:14 -04:00
Matthew Jones
a39b1e8436 Fix ipython version in dev container to 5.2.1 2017-04-26 09:57:51 -04:00
Ryan Petrello
c96b1d87ee Merge pull request #6106 from ryanpetrello/more_cred_migration 
fix a few more migration-related issues for credentials
 2017-04-26 09:40:09 -04:00
Ryan Petrello
66e004a9db fix a few more migration-related issues for credentials 2017-04-26 09:24:33 -04:00
Jared Tabor
9d307bc75e Merge pull request #6108 from jaredevantabor/ldap-user-group-search 
making ldap user/group search fields into codemirror instances
 2017-04-25 17:26:38 -07:00
Marliana Lara
babe59a9cc Merge pull request #6104 from marshmalien/fix/addContrastToRowShading 
Add more contrast to row shading in Tower
 2017-04-25 18:56:05 -04:00
jaredevantabor
b5d36e4038 making ldap user/group search fields into codemirror instances 2017-04-25 14:47:14 -07:00
Marliana Lara
79791a4fbc Remove ng-class-odd and ng-class-even directives 2017-04-25 16:22:18 -04:00
Matthew Jones
52fa9410f2 Merge pull request #6084 from cchurch/paginate_this 
Add custom paginator to avoid separate COUNT(*) query
 2017-04-25 16:05:48 -04:00
Marliana Lara
59ff065a65 fixes #3636 2017-04-25 15:54:07 -04:00
Ryan Petrello
9a4b972bab Merge pull request #6102 from ryanpetrello/vault_migration 
properly migrate vault credentials to the new credentialtype model
 2017-04-25 15:35:16 -04:00