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

13343 Commits

Author SHA1 Message Date
Michael Abashian
84507969f5 the _.eq alias must not be available in the version of lodash that we use. _.isEqual is available. 2017-07-03 14:23:59 -04:00
Ryan Petrello
e63eb35dd0 Merge pull request #6864 from ryanpetrello/fix-6780
substitute "$encrypted$" for actual password on logging config test
2017-07-03 14:01:09 -04:00
Ryan Petrello
1c066d478b substitute "$encrypted$" for actual password on logging config test
see: #6780
2017-07-03 12:14:43 -04:00
Bill Nottingham
42a55cd1b3 Merge pull request #6845 from wenottingham/not-funny-ha-ha
Remove old HA redirect template.
2017-07-03 09:43:45 -04:00
Michael Abashian
7f5a45f2fe Merge pull request #6848 from mabashian/6825-aws-credential-select
Fixed credential kind lookup on inventory source
2017-07-01 22:09:05 -04:00
Michael Abashian
a03d368e85 Merge pull request #6850 from mabashian/6760-host-link
Fixed linkout associate group/host name
2017-07-01 22:07:50 -04:00
Michael Abashian
8ed1091f44 Merge pull request #6849 from mabashian/6766-hide-disassociate-host
Hide disassociate host from non directly associated group
2017-07-01 22:07:07 -04:00
Michael Abashian
78ef0c06d2 Merge pull request #6847 from mabashian/6761-hide-page-size
Hide page size dropdown for multi-select lists in modals
2017-07-01 22:06:35 -04:00
Jared Tabor
48371d433f Merge pull request #6822 from jaredevantabor/insights
changes to insights
2017-06-30 16:57:29 -07:00
Michael Abashian
9eda282e8d Fixed linkout associate group/host name 2017-06-30 19:18:12 -04:00
Michael Abashian
708d0698bc Hide disassociate host from group when the host is not directly associated with the currently viewed group 2017-06-30 18:56:03 -04:00
Michael Abashian
776fae3c35 Fixed credential kind lookup on inventory source 2017-06-30 18:13:50 -04:00
Michael Abashian
a4a3271b04 Hide page size dropdown for multi-select lists in modals 2017-06-30 17:36:37 -04:00
Michael Abashian
8c834daf46 Merge pull request #6836 from mabashian/6656-multiselect-preview
Added multi-select preview to group/host associate and instance groups modals
2017-06-30 16:48:01 -04:00
Bill Nottingham
e14932f74a Remove old HA redirect template. 2017-06-30 16:39:05 -04:00
Matthew Jones
5bcefb7a83 Adding installer files to flake8 ignore 2017-06-30 16:25:52 -04:00
Matthew Jones
d443f5cf48 Merge branch 'containerization' into devel
* containerization:
  Updating make targets for fixes to bringing cluster up and svcs
  Adding Makefile targets for local builds/deployments
  Moving Openshift work to installer directory to reduce conflicts
  Support deploying Tower into OpenShift
  Implementing containerized tower packaging
2017-06-30 16:21:03 -04:00
Matthew Jones
d82c69680b Updating make targets for fixes to bringing cluster up and svcs 2017-06-30 16:06:57 -04:00
Aaron Tan
e3b7ec8997 Merge pull request #6817 from jangsutsr/6768_apply_validation_to_ctint_all_endpoint
Apply accumulated validation for CTinT all endpoint
2017-06-30 15:39:19 -04:00
Matthew Jones
0ee3ad8c14 Adding Makefile targets for local builds/deployments
Updating paths
2017-06-30 15:25:42 -04:00
Matthew Jones
4c32597873 Moving Openshift work to installer directory to reduce conflicts 2017-06-30 15:25:10 -04:00
Chris Meyers
b588dade9d Merge pull request #6833 from chrismeyersfsu/enhancement-insights_cred_summary
add insights_cred_id to host->inventory summary fields
2017-06-30 15:13:35 -04:00
Michael Abashian
0487de88e4 Make group and host plural 2017-06-30 15:06:51 -04:00
Michael Abashian
c343c00591 Added multi-select preview to group/host associate and instance groups modals. 2017-06-30 15:02:21 -04:00
Bill Nottingham
0d911581c3 Merge pull request #6835 from wenottingham/oh-no-the-synchronize-module
Require rsync on the Tower node.
2017-06-30 15:01:35 -04:00
Marliana Lara
193f3fa10e Merge pull request #6784 from marshmalien/rampartsViews
Implementation of Instance Groups read-only views in Tower Settings
2017-06-30 14:43:19 -04:00
Marliana Lara
ae209af566 Update PR based on review changes
* Remove unnecessary translates
* Extend show Refresh Button
* Update smart search sort and page size params
2017-06-30 13:57:49 -04:00
Marliana Lara
46f5f5da00 Implementation of Instance Groups read-only views in Tower Settings 2017-06-30 13:57:38 -04:00
Chris Meyers
29adb39cae add insights_cred_id to host->inventory summary fields 2017-06-30 13:52:41 -04:00
Ryan Petrello
430d4bc28e Merge pull request #6827 from ryanpetrello/devel
fix a bug in cluster node version comparison
2017-06-30 11:47:04 -04:00
Ryan Petrello
de84f3cf4a fix a bug in cluster node version comparison 2017-06-30 11:28:04 -04:00
Ryan Petrello
57eb632e51 Merge pull request #6819 from ryanpetrello/fix-6810
isolated nodes should report their awx version in their heartbeat
2017-06-30 09:59:07 -04:00
Chris Meyers
668bce8212 fix job launch deadlock
* This both fixes the deadlock problem and a logic problem. We shouldn't
set the job's job_template current_job to pending jobs.
2017-06-30 09:54:08 -04:00
jlmitch5
413976f2f7 Merge pull request #6814 from jlmitch5/loggingProtocolCtit
add logging protocol and timeout to ctit ui
2017-06-30 08:52:13 -04:00
Jared Tabor
32ddd8dab9 changes to insights
- better error handling for an invventory missing an insights cred
- better error handling for missing reports/no reports
- feedback from UX
- adding refresh button
2017-06-29 16:00:35 -07: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
Aaron Tan
f40182fef8 Apply accumulated validation for CTinT all endpoint. 2017-06-29 16:56:55 -04:00
Ryan Petrello
413e8c3bc9 isolated nodes should report their awx version in their heartbeat
see: #6810
2017-06-29 16:55:11 -04:00
Aaron Tan
e8433c6301 Merge pull request #6695 from ansible/jangsutsr_6005_add_boto3_support
Add boto3 dependency and remove requests freezing
2017-06-29 16:41:07 -04:00
Matthew Jones
d1ec8f93c0 Support deploying Tower into OpenShift 2017-06-29 16:31:07 -04:00
Aaron Tan
9aa4ea8e61 Add boto3 dependency and remove requests freezing 2017-06-29 16:03:07 -04:00
Ryan Petrello
e92c40d8ea Merge pull request #6815 from ryanpetrello/fix-rdb
fix the `make rdb` debugging tool
2017-06-29 15:53:05 -04:00
Ryan Petrello
8b0c5e796b Merge pull request #6809 from ryanpetrello/devel
properly configure celery routes for isolated node heartbeat
2017-06-29 15:52:14 -04:00
Ryan Petrello
611c42f741 fix the make rdb debugging tool 2017-06-29 15:40:09 -04:00
John Mitchell
3df6cda4cd add logging protocol and timeout to ctit ui 2017-06-29 15:39:36 -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
jlmitch5
59775c52c9 Merge pull request #6783 from jlmitch5/testLogAggregator
add test log aggregator button to ui
2017-06-29 14:56:41 -04:00
Jared Tabor
112230081e Merge pull request #6795 from jaredevantabor/skip-tags-job-tags
Skip tags job tags
2017-06-29 11:10:26 -07:00