1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Commit Graph

13683 Commits

Author SHA1 Message Date
AlanCoding
687074a3d7 allow reasonable scheduling of SCM inventory sources 2017-07-06 16:24:26 -04:00
Michael Abashian
d4cd5a958c Added our filter for Manual sources back in 2017-07-06 16:16:05 -04:00
Michael Abashian
527728176e Make source required (again) 2017-07-06 16:05:58 -04:00
Michael Abashian
0889cbaf3b Remove source required field 2017-07-06 16:05:58 -04:00
Michael Abashian
7d2e1de424 Make source field required and don't filter out Manual source type 2017-07-06 16:05:57 -04:00
AlanCoding
bb3c4c78f8 do not allow inv src source_project of manual type 2017-07-06 15:44:21 -04:00
Michael Abashian
ed3e03644b Merge pull request #6907 from mabashian/fix-groups-tab
Changed GroupList from value to factory
2017-07-06 14:31:25 -04:00
Matthew Jones
ee4449eed5 Use static secret key in generated dockerfile 2017-07-06 14:21:36 -04:00
Michael Abashian
407647e415 Changed GroupList from value to factory 2017-07-06 14:17:36 -04:00
Ryan Petrello
41001edf58 Merge pull request #6902 from ryanpetrello/fix-3508
Support AWX_TASK_ENV injection in task and notification invocations.
2017-07-06 14:01:13 -04:00
Ryan Petrello
12d41e2deb Support AWX_TASK_ENV injection in task and notification invocations.
This change _only_ injects `AWS_TASK_ENV` into `os.environ`; it's up to
underlying libraries to be good citizens and actually respect things
like `HTTPS_PROXY`.

see: #3508
2017-07-06 13:51:37 -04:00
Jared Tabor
3107cf0f72 Merge pull request #6863 from mabashian/6858-reset-source-type
Fixed console error when switching source type back to Choose a source
2017-07-06 09:46:31 -07:00
Jared Tabor
270d88be1d Merge pull request #6878 from jaredevantabor/insights
show/hide Insights action buttons
2017-07-06 09:45:31 -07:00
Michael Abashian
c2b552b3b2 Removed erroneous credential basepath line 2017-07-06 12:01:46 -04:00
Michael Abashian
a58b33e7c7 Merge pull request #6812 from mabashian/inventories-i18n
Marked strings for translation in the inventories-hosts directory
2017-07-06 11:30:58 -04:00
Michael Abashian
929ab0d5ce Merge branch 'devel' into inventories-i18n 2017-07-06 11:30:43 -04:00
Chris Meyers
e04c4e30d8 update tests to fix the removal of the word Tower 2017-07-06 11:22:16 -04:00
Chris Meyers
dae57b71d6 Merge pull request #6899 from chrismeyersfsu/fix-short_circuit
back out parent jt status update short circuit
2017-07-06 11:11:25 -04:00
Michael Abashian
819308dd6c Removed use of N_ in favor of i18n._ 2017-07-06 11:01:58 -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
Chris Meyers
0a25cc2d19 back out parent jt status update short circuit 2017-07-06 10:48:28 -04:00
Alan Rominger
c7fddc7ae7 fix flake8 error from removal of word Tower 2017-07-06 10:39:24 -04:00
Michael Abashian
0485118755 Merge pull request #6865 from mabashian/6804-eq
Use _.isEqual instead of alias _.eq
2017-07-06 10:34:15 -04:00
Michael Abashian
3d3ee33290 Changed sources list from value to factory 2017-07-06 10:23:56 -04:00
Michael Abashian
48c2fb51e0 Merge pull request #6856 from mabashian/4987-relaunch-redirect
Remain on jobs list when relaunching jobs
2017-07-06 10:04:20 -04:00
Aaron Tan
5df0ba5a06 Merge pull request #6874 from jangsutsr/6398_release_ujt_uniqueness_constraint
Release unified UJT unique_together constraint
2017-07-06 09:58:28 -04:00
Michael Abashian
22b5f31a51 Merge pull request #6867 from mabashian/6774-disassociate-tooltip
Fixed some disassociate tooltips
2017-07-06 09:57:35 -04:00
Michael Abashian
a2aba2f65a Merge pull request #6876 from mabashian/6871-associate-host
Fixed bug associating hosts
2017-07-06 09:56:19 -04:00
Aaron Tan
178bcb02a7 Merge pull request #6650 from jangsutsr/5799_allow_specifying_log_handler_level
Allow specifying log handler level
2017-07-06 09:51:30 -04:00
Aaron Tan
97e0835d1c Release unified UJT unique_together constraint. 2017-07-06 09:44:34 -04:00
Aaron Tan
9874e123be Allow specifying log handler level. 2017-07-06 09:39:54 -04:00
Bill Nottingham
92bc5fd3f0 Merge pull request #6895 from wenottingham/de-tower-ify
Remove assorted references to Tower.
2017-07-05 17:17:26 -04:00
Jared Tabor
87454ed90a redefining sources list as a value instead of a factory 2017-07-05 14:04:19 -07:00
Bill Nottingham
f8515857b2 Remove assorted references to Tower.
Reword and remove references to Tower so they don't need parameterized.
2017-07-05 16:42:47 -04:00
Chris Meyers
958aaffa62 Merge pull request #6691 from chrismeyersfsu/enhancement-migrate_scan_job
Migrate scan job to use tower fact cache instead
2017-07-05 15:58:51 -04:00
Chris Meyers
1331865749 take into account memcached key restrictions
* Keys can't contain spaces or control characters
2017-07-05 15:39:04 -04:00
Ryan Petrello
ea8f1740f2 Merge pull request #6892 from ryanpetrello/fix-3472
update help text for changes to AWX_PROOT_BASE_PATH
2017-07-05 15:08:17 -04:00
Aaron Tan
a6b2df6c98 Merge pull request #6846 from jangsutsr/6798_remove_named_url_setting_category_from_api_v1
Remove named URL setting category from API V1
2017-07-05 14:43:26 -04:00
Bill Nottingham
fe46c6f3b3 Merge pull request #6888 from wenottingham/quote-of-the-day
Ensure we quote '/' in username/password for SCM credentials.
2017-07-05 14:27:03 -04:00
Ryan Petrello
d9fcefa7ad update help text for changes to AWX_PROOT_BASE_PATH
see: #3472
2017-07-05 14:16:14 -04:00
Ryan Petrello
2adcf89bcb Merge pull request #6875 from ryanpetrello/fix-3472
standardize tasks.py temporary file paths under a single parameter
2017-07-05 14:08:06 -04:00
Ryan Petrello
0a5b9c458b standardize tasks.py temporary file paths under a single parameter
see: #3472
2017-07-05 13:50:43 -04:00
Chris Meyers
0d3fc3389d flake8 fix 2017-07-05 13:37:32 -04:00
Chris Meyers
e226b0ab37 noop pglock for unit tests 2017-07-05 13:34:07 -04:00
Chris Meyers
f3f9782c0b fix 2 data source inconcistency with failing tasks
* Do not "trust" the list of celery ids for database entries that were
modified after the list of celery ids was gotten.
* err on the side of caution and just let the next heartbeat celery
killer try killing the task if it needs to be reaped.
2017-07-05 13:33:29 -04:00
Chris Meyers
15aee1f8ac celery task fail check now uses pglock
* Align locking used by celery task cleaner upper with regular task manager.
* Uses pglock/advisory lock instead of abusing Instance table lock.
2017-07-05 13:27:08 -04:00
Ryan Petrello
a6975ad060 Merge pull request #6844 from ryanpetrello/fix-6561
add help text + i18n handling for built-in Tower credential types
2017-07-05 13:25:33 -04:00
Aaron Tan
3451591e66 Merge pull request #6884 from jangsutsr/6406_expose_ctint_log_aggregator_verify_cert
Expose LOG_AGGREGATOR_VERIFY_CERT to Tower configuration
2017-07-05 12:41:17 -04:00
Aaron Tan
a881946337 Expose LOG_AGGREGATOR_VERIFY_CERT to Tower configuration 2017-07-05 12:28:24 -04:00
Greg Considine
1e28ca1692 Merge pull request #6820 from gconsidine/ui/credentials-translation
Add translation for components and credentials
2017-07-05 12:11:13 -04:00