1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 22:21:13 +03:00
Commit Graph

12707 Commits

Author SHA1 Message Date
Michael Abashian
984f863dac Merge branch 'mabashian-inventory-codemirrors' into devel 2017-05-16 08:32:03 -04:00
Michael Abashian
786fa89db6 Merge branch 'inventory-codemirrors' of https://github.com/mabashian/ansible-tower into mabashian-inventory-codemirrors
# Conflicts:
#	awx/ui/client/src/inventories/hosts/host.form.js
2017-05-16 08:31:45 -04:00
Michael Abashian
ee0ac72c89 Merge pull request #6261 from mabashian/inventory-bug-fixes
Fixed inventory limit panels bug, breadcrumb and redirect bugs
2017-05-16 08:27:10 -04:00
Michael Abashian
e0a25b08e9 Merge pull request #6250 from mabashian/hosts-edit-groups
Fixed host list related groups tab.
2017-05-16 08:24:59 -04:00
Michael Abashian
8f7a489c30 Merge pull request #6229 from mabashian/adhoc-related
Fixed adhoc limit pattern when navigating from nested group to adhoc form
2017-05-16 08:23:25 -04:00
Michael Abashian
d304347312 Merge pull request #6162 from cchurch/fix_license_expires_on
Fix license expires on date
2017-05-16 08:22:27 -04:00
Matthew Jones
88706a7d6c Merge pull request #6267 from ansible/instance_group_ui_extra_fields
Adding more informative fields to HA model views
2017-05-16 02:24:57 +00: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
Matthew Jones
f96324aad8 Adding more informative fields to HA model views
Requested by the UI team to drive an Instances/InstanceGroup display
2017-05-15 15:47:48 -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
Matthew Jones
fc6630fd25 Consider that the project could be none when launching dependencies 2017-05-15 12:33:36 -04:00
Wayne Witzel III
8b0735a910 Merge pull request #6240 from wwitzel3/issue-6233
Add test to verify no duplicate results in DynamicFilter
2017-05-15 12:31:25 -04:00
Wayne Witzel III
477956ec30 Add distinct to HostManager for DynamicFilter results 2017-05-15 12:20:17 -04:00
Wayne Witzel III
b2b15043c9 Test that the DynamicFilter does not return duplicates. 2017-05-15 12:10:57 -04:00
Shane McDonald
066d2e87e3 Fix DEB builds
I was upgrading virtualenv for good measure in 4545fc1da1488bb1623de82ad19f78702bd6df62, but didnt foresee it causing problems. I was wrong. Worked for everything except Trusty builds.
2017-05-15 11:02:04 -04:00
Shane McDonald
81d10dd7f3 Add awx/ui/client/languages/ to ui-clean target
These json files are generated at build time.
2017-05-15 11:01:07 -04:00
AlanCoding
b41f4de4e5 Add docs from Instance Groups acceptance meeting 2017-05-15 10:16:47 -04:00
Michael Abashian
86d3d9466a Fixed limit panels bug, breadcrumb and redirect bugs 2017-05-15 10:13:31 -04:00
Wayne Witzel III
b9520c7f3b Merge pull request #6246 from wwitzel3/issue-5756
Create /inventories/N/update_inventory_sources endpoint.
2017-05-12 17:30:00 -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
Ryan Petrello
5b86fc299f Merge pull request #6257 from ryanpetrello/shaaaaaaaaaaaame
fix a typo causing tests to fail
2017-05-12 16:51:05 -04:00
Ryan Petrello
7c3b189eff Merge pull request #6252 from ryanpetrello/ssh_credential_refactor
refactor and fix ssh_private_key and ssh_key_unlock validation
2017-05-12 16:48:51 -04:00
Matthew Jones
b7622a6ed9 Remove test_partial 2017-05-12 16:46:55 -04:00
Ryan Petrello
e3842cfb50 Merge pull request #6254 from ryanpetrello/devel
squash together a few credential-related migrations
2017-05-12 16:44:06 -04:00
Chris Meyers
45d609e6a9 Merge pull request #6251 from chrismeyersfsu/fix-6235
boolean logic performed on filter results
2017-05-12 15:34:39 -04:00
Ryan Petrello
1ba71acf07 fix a typo causing tests to fail 2017-05-12 15:34:23 -04:00
Ryan Petrello
b9007997eb squash together a few credential-related migrations 2017-05-12 14:42:12 -04:00
Matthew Jones
754f698b9b Renaming migration for instance groups 2017-05-12 14:25:54 -04:00
Matthew Jones
1a4a6273a4 Merge branch 'rampart_groups_setup_playbook' into devel
* rampart_groups_setup_playbook:
  Updating changelog for Instance Groups
  Fix an incorrect reference on instance group jobs list
  Purge remaining references to rampart groups
  Simplify can_access for instance groups on job templates
  Adding Instance Group permissions and tests
  Increase test coverage for task scheduler inventory updates
  Exit logic fixes for instance group tools
  View Fixes for instance groups
  new view to allow associations but no creations
  Updating acceptance documentation and system docs
  Updating unit tests for task manager refactoring
  Update views and serializers to support instance group (ramparts)
  Implementing models for instance groups, updating task manager
  Updating the setup playbook to support instance group installation
  Add nginx to server start and switch back to first tmux win
  Fix an issue where the local queue wouldn't use the rabbitmq name
2017-05-12 13:40:30 -04:00
Matthew Jones
e7ba2a1078 Updating changelog for Instance Groups 2017-05-12 13:24:14 -04:00
Marliana Lara
cad1ba0972 Merge pull request #6253 from marshmalien/truncateRevisionHash
Abbreviate revision hash within the Projects panel
2017-05-12 12:37:54 -04:00
Michael Abashian
06d5f16730 Fixed inventory codemirror namespace clashing amongst other small bug fixes 2017-05-12 12:24:01 -04:00
Chris Meyers
cc4692932a update Host manager to handle Query Sets
* filter_host_string now returns a query set instead of Q(). This change
updates the Host manager to remove the .filter() call since the results
returned from filter_host_string() has already turned Q() -> Query Set
2017-05-12 12:14:32 -04:00
Matthew Jones
81611b44f6 Fix an incorrect reference on instance group jobs list 2017-05-12 12:12:29 -04:00
Marliana Lara
62c4efe19b Remove try/catch block of copyRevisionHash() 2017-05-12 10:02:52 -04:00
Ryan Petrello
0ac4f71e5b refactor and fix ssh_private_key and ssh_key_unlock validation
`clean_ssh_key_data` and `clean_ssh_key_unlock` no longer work because
they're not actual fields on `model.Credential` anymore.  This change
refactors/moves their validation to a place that works (and makes more
sense).
2017-05-12 09:42:29 -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
Chris Meyers
b55af095ef boolean logic performed on filter results
* Before, the boolean logic operators were performed against the Q()
objects, iteratively. Now, boolean logic is done after
Host.objects.filter(Q()). This results in the wanted and expected
results.
2017-05-12 09:26:11 -04:00
Matthew Jones
51bb85c3e2 Purge remaining references to rampart groups
* Acceptance Docs references
* Installer references
2017-05-11 22:25:57 -04:00
Matthew Jones
c1a6fc050d Simplify can_access for instance groups on job templates 2017-05-11 22:17:42 -04:00
Michael Abashian
c04ac86df8 Merge pull request #6248 from mabashian/makefile-fix
Fixed make docker-compose-test
2017-05-11 21:21:12 -04:00
Marliana Lara
82683d423f Add tooltip to revision copy link 2017-05-11 18:20:35 -04:00