13093 Commits

Author SHA1 Message Date
Alan Rominger
b9ecc775dc Update developer documentation for isolated jobs 2017-06-20 15:09:45 -04:00
Wayne Witzel III
9a48f16bf2 Merge pull request #6645 from ansible/fallback-test
Fix reencryption migrations.
2017-06-20 13:03:36 -04:00
Christian Adams
e7885edaa1 Merge pull request #6628 from rooftopcellist/cap-fix
Capacity percentage fix
2017-06-20 11:47:32 -04:00
adamscmRH
fa5b18e4d3 Fix InsGroup Cap Calc 2017-06-20 11:09:00 -04:00
Wayne Witzel III
3750f2ebf3 copy NotificationTemplate code for migration and use Credential model directly 2017-06-20 10:39:07 -04:00
Wayne Witzel III
bd52e4bb22 allow conf.settings to fallback to old encryption methods so settings work during migrations 2017-06-20 10:38:34 -04:00
Wayne Witzel III
7111d9232f Fix should_decrypt_field to work with non-str fields (return False) 2017-06-20 10:37:44 -04:00
Ryan Petrello
8ae8e0bf2d Merge pull request #6639 from ryanpetrello/isolated-rsync-race
fix a race condition in isolated stdout processing
2017-06-20 09:00:23 -04:00
Ryan Petrello
c35d83df13 fix a race condition in isolated stdout processing 2017-06-19 16:59:03 -04:00
Ryan Petrello
157835ceac Merge pull request #6638 from ryanpetrello/isolated-bubblewrap
Include the Tower venv in the isolated bubblewrapped arguments.
2017-06-19 16:06:40 -04:00
Ryan Petrello
2ba9e56033 Include the Tower venv in the isolated bubblewrapped arguments.
This moves the container-based code location and venvs.
The goal here is that the paths of Tower source for isolated
vs normal nodes matches (both in prod and local development) so that we
don't have to add a bunch of additional bwrap argument logic for
<location-of-isolated-tower-venv>.
2017-06-19 15:52:54 -04:00
John Mitchell
ba22b3426d fix issue where machine cred was untoggling when an extra credential tag was removed 2017-06-19 13:02:00 -04:00
jlmitch5
be3b0ff330 Merge pull request #6630 from jlmitch5/select2CredentialType
select2ify credential type in add cred modals
2017-06-19 12:24:40 -04:00
John Mitchell
b5b619d491 select2ify credential type in add cred modals 2017-06-19 11:42:11 -04:00
jlmitch5
8061667ace Merge pull request #6609 from jlmitch5/newCredOnJT
multi-credential ui selector on job template page
2017-06-19 10:31:52 -04:00
Greg Considine
b4be8e833f Merge pull request #6557 from gconsidine/audic/ui-components
Audic/ui components
2017-06-16 16:46:01 -04:00
Wayne Witzel III
e1e416bc6d Update CHANGELOG, Fernet256 2017-06-16 16:38:14 -04:00
Wayne Witzel III
2b98f2b9c9 Merge pull request #6622 from wwitzel3/devel
Implement Fernet256 using AES-256-CBC
2017-06-16 16:31:17 -04:00
gconsidine
81fbbde37b Update karma config for ui tests 2017-06-16 16:16:21 -04:00
Wayne Witzel III
7f72d5c6d1 Implement Fernet256 using AES-256-CBC 2017-06-16 16:06:57 -04:00
Ryan Petrello
6baf505797 Merge pull request #6612 from ryanpetrello/isolated_check_interval
more isolated task execution tweaking
2017-06-16 15:44:22 -04:00
Ryan Petrello
1ea03aa4c9 more isolated task execution tweaking
* set a more reasonable default `AWX_ISOLATED_CHECK_INTERVAL`
* make manual cancellation work for high values of
  `AWX_ISOLATED_CHECK_INTERVAL`
* remove the `/tmp/ansible_tower/jobs/` symlink directory

see: #6616
2017-06-16 15:37:07 -04:00
gconsidine
fa330db9c5 Add UI/UX polish in prep for merge
* Bring UI/UX inline with recent changes
* Use select components as a stopgap for credential_types and orgs
* Add tabs to permissions view
* Add Organization model
2017-06-16 15:23:18 -04:00
John Mitchell
adfe4ef92f update multi cred and prompt on launch modals to show net credential kinds 2017-06-16 14:57:40 -04:00
John Mitchell
e1fadd0c8a update help text wording for credential field on jt page based on tvo's feedback 2017-06-16 14:51:43 -04:00
John Mitchell
b5bc387d33 implement multi credential selection in ui for job templates 2017-06-16 14:49:45 -04:00
Marliana Lara
d7486141bd Merge pull request #6605 from marshmalien/rampartsMultiSelectModal
Instance Groups modal and multiselect checklist
2017-06-16 14:42:36 -04:00
Ryan Petrello
04e38fb327 Merge pull request #6614 from ryanpetrello/fix_instance_group_removal
fix a typo in the `tower-manage instance_group_remove` arg parsing
2017-06-16 11:39:47 -04:00
Ryan Petrello
1b88349f1e fix a typo in the tower-manage instance_group_remove arg parsing 2017-06-16 11:21:35 -04:00
Marliana Lara
edcce9bfd8 Fix jshint error 2017-06-16 10:16:23 -04:00
Ryan Petrello
3ebcf0c0e6 Merge pull request #6608 from ryanpetrello/devel
isolated ramparts: replace systemd unit with a `tower-expect` binary
2017-06-16 10:11:35 -04:00
Ryan Petrello
44e0c8621a isolated ramparts: replace systemd unit with a tower-expect binary
instead of launching isolated tasks via `systemctl`, treat
`awx.main.isolated.run` as an executable that knows how to daemonize

additionally, add `setup.py isolated_build` for isolated Tower source
distribution
2017-06-16 09:59:21 -04:00
Marliana Lara
e407a79af8 Remove debugging code line 2017-06-16 09:58:58 -04:00
gconsidine
861cfd3e13 Add implemented permissions on credentials 2017-06-15 18:27:11 -04:00
Marliana Lara
850df5c646 Style Instance Groups tags to appear like Labels 2017-06-15 16:02:54 -04:00
Marliana Lara
8c756c49b2 Add Multiselect checklist modal to Instance Group Fields
Update Issue: #5849
2017-06-15 15:14:42 -04:00
Bill Nottingham
23b5f26a83 Merge pull request #6450 from wenottingham/devel
Remove redis dependencies from Ubuntu builds.
2017-06-15 13:46:43 -04:00
Bill Nottingham
ed6db3043d Merge pull request #6316 from wenottingham/NOT_OPTIONAL
Drop optional repos from the repolist, as we do not currently require them
2017-06-15 13:46:24 -04:00
Aaron Tan
04ca05ac43 Merge pull request #6603 from jangsutsr/6602_add_value_validation_to_sublist_attach
Add value type validation to sublist (un)attach
2017-06-15 13:28:49 -04:00
Aaron Tan
7039e2e3de Merge pull request #6420 from jangsutsr/license_updates
License updates
2017-06-15 13:27:19 -04:00
Wayne Witzel III
41d9145403 Merge pull request #6601 from wwitzel3/devel
Fix re-encryption migration for credentials.
2017-06-15 13:13:40 -04:00
Aaron Tan
bef009659d Add value type validation to sublist (un)attach 2017-06-15 12:24:15 -04:00
Wayne Witzel III
f9b412419c update encryption migration checks and tests 2017-06-15 12:06:18 -04:00
Wayne Witzel III
9014e8c612 remove if AESCBC overhead 2017-06-15 11:25:29 -04:00
Wayne Witzel III
c554c10c5c remove credential_type iteration, explicitly check for encyption with startswith 2017-06-15 11:25:29 -04:00
Wayne Witzel III
2c1a39233e monkey-patch get_current_apps so that resolve_role_field works correctly 2017-06-15 11:25:28 -04:00
Wayne Witzel III
adc371fcf8 remove errant encryption migration call
ensure credential migration was using the proper algorithm
2017-06-15 11:25:28 -04:00
Aaron Tan
9c37340b3c Merge pull request #6596 from jangsutsr/6118_regress_trailing_comma_modification
Regress trailing comma modification and enhance error message
2017-06-15 11:24:28 -04:00
Aaron Tan
ef6da022ee Merge pull request #6600 from jangsutsr/6313_make_up_migration_updates
Make up migration updates
2017-06-15 11:19:30 -04:00
Aaron Tan
bcba9e53fd Make up migration updates. 2017-06-15 10:14:52 -04:00