External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 05:31:22 -03:30
Code Issues Packages Projects Releases Wiki Activity
12,160 Commits 54 Branches 19 Tags
Commit Graph

12160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Tan
3a81ca0dce Restore ability of parsing extra_vars string for provisioning callback. 2017-04-24 17:43:20 -04:00
jlmitch5
7d7d1daae7 Merge pull request #6074 from jlmitch5/fixEscapingStdout 
Fix escaping stdout
 2017-04-24 11:47:39 -04:00
Shane McDonald
74636d3623 Merge pull request #6082 from shanemcd/5959 
Stop / start ansible-tower-service during restores
 2017-04-20 15:03:34 -04:00
Wayne Witzel III
c058f76960 value_to_python should encode lookup fields as ascii 2017-04-20 13:22:54 -04:00
John Mitchell
a44e5b208a fix brace interpolation on standard out pane 2017-04-20 12:27:58 -04:00
Bill Nottingham
e8126aab34 Merge pull request #6068 from wenottingham/release_3.1.3 
Adjust some hardcoded usages of 'awx' to use 'aw_user' and 'aw_group'.
 2017-04-20 11:28:05 -04:00
Shane McDonald
2cb88deee1 Merge pull request #6065 from shanemcd/updated-es-translations 
Updated Spanish translations
 2017-04-20 08:14:37 -04:00
Shane McDonald
08aada3362 Pull Spanish updates from Zanata 2017-04-20 08:05:14 -04:00
Shane McDonald
9831c4551d Merge pull request #6057 from shanemcd/external-db-restore 
Fix external database restores
 2017-04-19 10:09:46 -04:00
Jared Tabor
5b20b0a02f Merge pull request #6048 from jaredevantabor/adhoc-modules 
CTiT -> adhoc modules should allow the user to add new modules
 2017-04-18 15:46:18 -07:00
Greg Considine
c8394bbca3 Merge pull request #6050 from gconsidine/fix/dropdown-text-truncation 
Add dropdown li truncation with ellipsis
 2017-04-18 15:23:06 -04:00
Michael Abashian
58cc33481e Merge pull request #6000 from mabashian/5926-survey-password-minlength 
Fixed min/max length survey password bug
 2017-04-18 14:09:08 -04:00
jlmitch5
9b3036f150 Merge pull request #6051 from jlmitch5/fixCappedLines 
don't display chunked lines'
 2017-04-18 13:46:32 -04:00
Greg Considine
820bc6f630 Merge pull request #6035 from gconsidine/fix/permission-mod-basic-license 
Fix permission modal in team settings
 2017-04-18 13:32:02 -04:00
John Mitchell
ea0f7ad0de don't display chunked lines' 2017-04-18 12:56:22 -04:00
gconsidine
da0a721a2d Add dropdown li truncation with ellipsis 
Display the full text on hover by expanding the list item
container.
 2017-04-18 12:07:18 -04:00
jaredevantabor
90a45c8fc3 CTiT -> adhoc modules should allow the user to add new modules 
the adhoc module field was not setup to allow users to input
additional options.
 2017-04-17 15:48:41 -07:00
Shane McDonald
7de092ff37 Merge pull request #6044 from shanemcd/awx-user-supervisorctl 
Give awx ownership of supervisor.sock
 2017-04-17 17:31:55 -04:00
Alan Rominger
31c18f2e16 Merge pull request #6039 from AlanCoding/log_certs 
Setting for external logging cert verification
 2017-04-17 16:59:33 -04:00
AlanCoding
3af0f505d8 Setting for external log emissions cert verification 
Stopgap solution for issue for 3.1.3 where Splunk servers with a
self-signed certificate could not receive logs from Tower.
Users should set `LOG_AGGREGATOR_VERIFY_CERT = False` in settings
to use this.
 2017-04-17 14:50:01 -04:00
gconsidine
6c06344fdb Fix permission modal in team settings 
A GET request is made to check permissions on job templates, workflow
templates, inventories, etc. With a basic license, the workflow
template request returns a 402. The logic in place accounted for
500-ish errors and 200s. Now if a 402 response is returned, it's
excluded from the UI without affecting the other successful responses.
 2017-04-17 11:22:03 -04:00
Aaron Tan
30193ffea5 Merge pull request #5970 from jangsutsr/5628_update_ctit_serializer_fields_to_handle_html_cornercase 
Update CTinT serializer integer field to handle html cornercase
 2017-04-17 11:21:02 -04:00
Alan Rominger
6d17158b34 Merge pull request #5973 from AlanCoding/survey_choices_string 
When survey choices are strings, don't just check "X in choices"
 2017-04-17 11:05:50 -04:00
Alan Rominger
7dd69a36d8 Merge pull request #6017 from AlanCoding/supervisor_verbosity 
Add supervisorctl logs
 2017-04-13 11:07:41 -04:00
AlanCoding
6f0a8949a6 Add supervisorctl logs 
In some systems, the tower service process may not have sufficient
permissions to communicate with the supervisorctl socket, in which
case an automated restart will not be possible.
 2017-04-12 16:46:58 -04:00
Chris Meyers
817ca503e8 Merge pull request #6002 from chrismeyersfsu/fix-5984 
lock projects on project sync
 2017-04-12 13:25:51 -04:00
Chris Meyers
70fafe75d2 clean up commented code 2017-04-12 11:42:31 -04:00
Chris Meyers
d1eba4b607 log lock errors and test it 2017-04-12 11:41:11 -04:00
Michael Abashian
5e9522322c Merge pull request #5998 from mabashian/5947-copy-move-host-pagination 
Fixed copy/move groups/hosts pagination bug
 2017-04-12 10:23:54 -04:00
Chris Meyers
7919c47370 put lock file in project root dir 2017-04-12 09:36:15 -04:00
Ryan Petrello
f6510dbd4a Merge pull request #5983 from ryanpetrello/release_3.1.3 
Be more restrictive in catching LDAP exceptions.
 2017-04-11 16:52:53 -04:00
Ryan Petrello
d1eb33bca0 Be more restrictive in catching LDAP exceptions. 
django-auth-ldap can throw exceptions, like TypeError if it's
misconfigured.  If we encounter an exception attempting to log into an
LDAP server, log it and move on (otherwise, an uncaught exception will
cause local login to fail, too).

see: #5933
 2017-04-11 16:43:26 -04:00
Chris Meyers
648aa470d7 lock projects on project sync 
* Use filesystem, blocking, locks to prevent two project syncs for the
same project from running the project update playbook at the same time.
 2017-04-11 15:47:46 -04:00
Michael Abashian
c3d002cc0f Fixed min/max length survey password bug where password had default and min > 12 2017-04-11 15:13:13 -04:00
Aaron Tan
9027616420 Merge pull request #5989 from jangsutsr/5986_prevent_unexpected_callback_module_attribute_warning 
Prevent unexpected callback module attribute warning
 2017-04-11 14:54:38 -04:00
Michael Abashian
34c278fef5 Merge pull request #5996 from mabashian/5972-single-select-survey 
Optional single select survey question with default bug fix
 2017-04-11 13:25:32 -04:00
Michael Abashian
59b8ba2a1c Fixed copy/move groups/hosts pagination bug 2017-04-11 13:22:41 -04:00
Aaron Tan
6884e44bb3 Unit test added. 2017-04-11 11:40:47 -04:00
Matthew Jones
645c2dbbc6 Switch uwsgi to only listen on local interface 
Previously it would listen systemwide on 0.0.0.0:8050
 2017-04-11 10:55:20 -04:00
Matthew Jones
518e7cc896 Merge pull request #5987 from ansible/version_protection_check 
Protect cluster nodes after an upgrade
 2017-04-11 10:37:29 -04:00
Shane McDonald
6b06e741e0 Update pot files 
Steps taken:

$ make docker-compose-test

Create /root/.config/zanata.ini (Obtained from https://translate.engineering.redhat.com/dashboard/settings/client)

Update .pot files:

$ make pot
$ make languages

Push to Zanata:

python tools/scripts/manage_translations.py push --both --lang es
 2017-04-10 20:08:34 -04:00
Bill Nottingham
2360f5effe Spanish translation from alberto@oforte.net. 2017-04-10 18:53:37 -04:00
Michael Abashian
9a678c72dc Fixed bug where optional single select survey questions with a default value couldn't be skipped 2017-04-10 17:13:42 -04:00
Matthew Jones
b1c839ea62 Refactor service reloading unit tests 
Make sure these are consistent with the more flexible utility commands
 2017-04-10 15:37:45 -04:00
Matthew Jones
ea8b78ca49 Protect cluster nodes after an upgrade 
* Modify instance model to container a version number for the node
* Update that version number during the heartbeat
* If during a heartbeat any of the nodes are of a newer version then
  shutdown the current node.

The idea behind this is that if all nodes were upgraded at the same
time then at the moment of the healthcheck they should all be at the
newer version. Otherwise we put the system in a state where it can
receive the upgrade but stay down until that happens. During setup
playbook run the services will be fully restarted.
 2017-04-10 15:37:33 -04:00
Aaron Tan
9b1107c054 Prevent unexpected callback module attribute warning. 2017-04-10 14:40:57 -04:00
Aaron Tan
b0a8e8c332 Update CTiT serializer integer field to handle html cornercase. 2017-04-07 16:53:35 -04:00
Alan Rominger
f0102ef0ff Merge pull request #5978 from AlanCoding/hide_ev_notification 
Hide extra_vars in job notifications
 2017-04-07 15:33:34 -04:00
AlanCoding
3e9bc3b3d4 Hide extra_vars in job notifications 2017-04-07 11:49:03 -04:00
AlanCoding
b9c45ed54a Fix bug where API assumed survey choices were list 
Applies to both single-select and multi-select type questions.
UI sends choices in the form of text with line breaks
separating the options.
Customer complained about empty string erronously sent by
the UI being passed to playbook, which is a component of this.
 2017-04-07 09:03:45 -04:00