Commit Graph

13123 Commits

Author SHA1 Message Date
Michael Abashian 8327a8dc09 Fixed scm type js error 2017-06-22 09:59:50 -04:00
Aaron Tan 238e069bf3 Merge pull request #6586 from jangsutsr/6584_change_model_url_name_implementation
Handle unexpected resource url naming convention
2017-06-21 20:42:59 -04:00
Aaron Tan 0be3d39047 Handle unexpected resource url naming convention. 2017-06-21 16:34:35 -04:00
Alan Rominger 2beb4e8885 Merge pull request #6673 from AlanCoding/iso_cap_select
Select isolated node inside of queue based on capacity
2017-06-21 16:03:06 -04:00
Aaron Tan 6db945247d Merge pull request #6576 from jangsutsr/6568_update_named_url_delimiter
Update named URL delimiter
2017-06-21 15:56:02 -04:00
AlanCoding d69b4e00ff select isolated node inside of queue based on capacity 2017-06-21 15:48:23 -04:00
jlmitch5 986c35c1e8 Merge pull request #6637 from jlmitch5/revertInMultiCred
update revert link text size in prompt
2017-06-21 15:05:37 -04:00
Christian Adams 5bbfda0189 Merge pull request #6671 from rooftopcellist/missing-proc-fix
Missing Procfile docker-compose-cluster fix
2017-06-21 14:38:54 -04:00
Alan Rominger 72cf434c2e Merge pull request #6669 from AlanCoding/tower_controller_fix
fix bug that blocks tower controller groups
2017-06-21 14:35:59 -04:00
adamscmRH e0581af9ff Missing Procfile docker-compose fix 2017-06-21 14:29:49 -04:00
Michael Abashian e41b9814e4 Merge pull request #6664 from mabashian/6591-inv-update-relaunch
Removed extraneous fields being passed to InventoryUpdate
2017-06-21 14:12:01 -04:00
Wayne Witzel III d39dba9892 Merge pull request #6665 from ansible/fallback-test
Reencrypt during data migrations
2017-06-21 12:03:08 -04:00
Wayne Witzel III fe3e5a48c3 Reencrypt during data migrations 2017-06-21 11:54:36 -04:00
Michael Abashian 2afbbe2c13 Removed extraneous fields being passed to InventoryUpdate, only the url is needed 2017-06-21 11:26:12 -04:00
Ryan Petrello 79a6cabbbc Merge pull request #6652 from ryanpetrello/fix-4823
store stderr on successful inventory syncs
2017-06-21 10:35:29 -04:00
Ryan Petrello b8e0c91bd4 store stderr on successful inventory syncs
see: #4823
2017-06-21 10:20:50 -04:00
Jared Tabor 0121f5cde4 Merge pull request #6607 from jaredevantabor/awx-logos
Awx logos
2017-06-20 14:44:42 -07:00
Alan Rominger 8bec16c1b0 Merge pull request #6649 from ansible/AlanCoding-patch-2
Update developer documentation for isolated jobs
2017-06-20 17:28:15 -04:00
Alan Rominger 2c92f623d8 Merge pull request #6617 from ansible/isolated_setup
setup playbook and heartbeat for isolated deployments
2017-06-20 17:20:53 -04:00
Alan Rominger b9ecc775dc Update developer documentation for isolated jobs 2017-06-20 15:09:45 -04:00
AlanCoding 40287d8e78 multi-host isolated heartbeat w tower-isolated check
* use tower-expect command to determine job status when running
  the isolated heartbeat playbook
* grok JSON output of playbook to obtain result information
* run playbook against multiple isolated hosts at the same time
  (addresses scalability concerns)
2017-06-20 14:36:18 -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
Jared Tabor 6503d0cc84 mobile breakpoint 2017-06-19 18:51:14 -07:00
Jared Tabor 33165553a9 fixing main menu logo on mobile breakpoint 2017-06-19 18:14:11 -07: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 8b0876cb3a update revert link text size in prompt
add revert to multi cred modal
2017-06-19 15:26:21 -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
AlanCoding f371dd71b2 Run isolated heartbeat against all hosts at once
Previously we were running the playbook on a host-by-host
basis, but this changes it to pass in the list of all
isolated isntances the machine is responsible for.
Using the `json` Ansible stdout module, we are able to
parse the output for information on each host.
2017-06-19 12:13:36 -04:00
AlanCoding 7eb8fdd0f1 Change use of subprocess lib for calculating system capacity
Suggested by Ryan Petrello as a part of the PR feedback
for the isolated instance setup work.
2017-06-19 12:13:36 -04:00
AlanCoding 1d9f2be0e4 add task in isolated heartbeat to delete rogue files 2017-06-19 12:13:36 -04:00
AlanCoding dd1a261bc3 setup playbook and heartbeat for isolated deployments
* Allow isolated_group_ use in setup playbook
* Tweaks to host/queue registration commands complementing setup
* Create isolated heartbeat task and check capacity
* Add content about isolated instances to acceptance docs
2017-06-19 12:13:36 -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