Ryan Petrello
1a1b9e9138
redact the license key from settings.LICENSE activity stream entries
...
see: https://github.com/ansible/tower/issues/2671
2018-07-30 11:43:42 -04:00
Christian Adams
5a7b519101
Merge pull request #2705 from rooftopcellist/oauth2_typo
...
fix OAuth typos
2018-07-30 10:42:54 -04:00
adamscmRH
1303f3f82f
fix OAuth typos
2018-07-30 10:23:27 -04:00
Ryan Petrello
681d64c96f
Merge pull request #2703 from ryanpetrello/simplify-dynamic-queues
...
simplify dynamic queue binding
2018-07-30 09:25:44 -04:00
Ryan Petrello
3cdd0a94bd
simplify dynamic queue binding
...
we recently made a change so that instances no longer bind to
instance-group specific queues, but now instead they each bind to
a direct queue for their specific hostname
(https://github.com/ansible/tower/pull/1922 )
Because of this, we shouldn't *need* to reconfigure the queue binds at
runtime anymore when group membership changes. Under our new model,
every celeryd listens on a queue named after its hostname; when the
scheduler finds a task to run, it picks an Instance in the target
Instance Group and sends the task to the queue for that Instance's
hostname.
2018-07-28 00:48:37 -04:00
Shane McDonald
795f26e7b9
Lock down version of setuptools_scm
...
This was causing offline pip installs to fail for some weird reason:
The 'setuptools_scm>=1.15.0' distribution was not found and is required by the application
Even though it is there. v2.x still works.
2018-07-27 15:28:41 -04:00
Jake McDermott
dce50304f3
Merge pull request #2699 from jakemcdermott/fix-2698
...
fix portal mode job list
2018-07-27 14:14:00 -04:00
John Mitchell
d025f5ed2b
Merge pull request #2693 from jlmitch5/fixAppTokensListRowItems
...
remove org and last used, fix expired datetime on app token list
2018-07-27 12:34:49 -04:00
Ryan Petrello
2371d23b7e
Merge pull request #2701 from ryanpetrello/openshift-tls-autoredirect
...
change openshift edge termination policy to redirect (enforce https)
2018-07-27 12:31:44 -04:00
Ryan Petrello
7588e65786
change openshift edge termination policy to redirect (enforce https)
...
see: https://github.com/ansible/tower/issues/2591
related: https://docs.openshift.org/latest/architecture/networking/routes.html
2018-07-27 10:34:07 -04:00
Christian Adams
a2912ada11
Merge pull request #2696 from rooftopcellist/update_sdb_hostname
...
fix sdb, update host var
2018-07-27 09:37:06 -04:00
Jake McDermott
9e71760af7
add jobs portal relaunch test
2018-07-27 01:06:13 -04:00
Jake McDermott
61d1cb46ac
fix job portal list dependency reference error
2018-07-27 00:54:12 -04:00
Jake McDermott
93c18fb40a
Merge pull request #2694 from mabashian/2652-job-id
...
Display job id along with name in jobs list
2018-07-26 18:49:05 -04:00
Jake McDermott
c715f73160
Merge pull request #2684 from jakemcdermott/fix-2958
...
handle finished job runs with incomplete status info
2018-07-26 17:58:52 -04:00
adamscmRH
df6b7627bc
fix sdb, update host var
2018-07-26 17:48:00 -04:00
Ryan Petrello
a211e24c0f
Merge pull request #2695 from ryanpetrello/celerywatcher-iso8601
...
some celery-watcher tweaks
2018-07-26 17:44:50 -04:00
Jake McDermott
2ba0319e79
handle finished job run with incomplete status info
2018-07-26 17:40:43 -04:00
Ryan Petrello
9b1961f60d
some celery-watcher tweaks
...
* give celery more time to reply over AMQP (the default timeout is 1s)
* record datestamps in celery watcher logs for debugging purposes
2018-07-26 17:16:05 -04:00
Michael Abashian
3caeb91419
Merge pull request #2689 from mabashian/2676-jobs-pagination
...
Fixes pagination on IG/Instance jobs lists
2018-07-26 14:49:05 -04:00
mabashian
fa414d5569
Display job id along with name in jobs list
2018-07-26 14:46:53 -04:00
John Mitchell
0d9dbc15a7
remove org and last used, fix expired datetime on app token list
2018-07-26 13:57:45 -04:00
Ryan Petrello
7acfe414a6
Merge pull request #2686 from ryanpetrello/non-exclusive-policy-instance-list
...
show the manual instance tag based on the correct instance attribute
2018-07-26 11:32:43 -04:00
mabashian
7a509a4dcb
Fixes pagination on IG/Instance jobs lists
2018-07-26 10:56:11 -04:00
Alan Rominger
979eaeddfa
Merge pull request #2687 from AlanCoding/play_nice
...
fix conflicting migrations
2018-07-26 10:45:08 -04:00
AlanCoding
d1b89815f7
fix conflicting migrations
2018-07-26 10:38:26 -04:00
Ryan Petrello
bb034f007a
show the manual instance tag based on the correct instance attribute
...
see: https://github.com/ansible/tower/issues/2583
2018-07-26 10:24:35 -04:00
Christian Adams
0694fa83b0
Merge pull request #2682 from rooftopcellist/remove_client_credentials
...
Remove Client Credentials grant_type
2018-07-26 10:18:46 -04:00
Ryan Petrello
57fdbc1853
Merge pull request #2677 from ryanpetrello/non-exclusive-policy-instance-list
...
make InstanceGroup.policy_instance_list non-exclusive by default
2018-07-25 21:10:15 -04:00
adamscmRH
87829ea339
remove client credentials grant_type
2018-07-25 18:23:08 -04:00
Jake McDermott
76d83b0acb
Merge pull request #2681 from jakemcdermott/test-stability-fixes
...
improve stability of inventory copy test and credentials form test
2018-07-25 18:10:44 -04:00
Jake McDermott
404950104b
fix logic error in test
2018-07-25 17:46:24 -04:00
Ryan Petrello
15aaca8f03
make InstanceGroup.policy_instance_list non-exclusive by default
...
see: https://github.com/ansible/tower/issues/2583
2018-07-25 17:26:13 -04:00
Jake McDermott
5586b5c645
improve test stability for inventory copy and credentials form
2018-07-25 17:11:20 -04:00
Alan Rominger
5a7119759a
Merge pull request #2672 from AlanCoding/popin_locking
...
Lock IG for updating list
2018-07-25 15:48:41 -04:00
Jared Tabor
a4960a9c3a
Merge pull request #2667 from jaredevantabor/dep-lockdown
...
Adds npm-shrinkwrap and locks down ui-router version
2018-07-25 10:36:15 -07:00
Yunfan Zhang
fec1e8d398
Merge pull request #2363 from YunfanZhang42/fix_crendential_copy
...
Fix credential leak when copying Job Templates
2018-07-25 13:14:40 -04:00
Jared Tabor
239dcac3b4
Merge pull request #2 from jaredevantabor/jared/dep-lockdown
...
Shrink-wrap dev dependencies as well
2018-07-25 09:45:51 -07:00
Yunfan Zhang
cb6d7dfe69
Fix credential leak when copying Job Templates.
...
Signed-off-by: Yunfan Zhang <yz322@duke.edu>
2018-07-25 11:51:17 -04:00
kialam
9e164b41a6
Shrink-wrap dev dependencies as well
2018-07-25 11:46:13 -04:00
AlanCoding
39cb9f2652
lock IG for updating list
2018-07-25 11:08:40 -04:00
Ryan Petrello
27fbfbb62d
Merge pull request #2668 from ryanpetrello/verify-csrf-websockets
...
prevent cross site request forgery in websockets w/ a CSRF token
2018-07-25 10:15:36 -04:00
Ryan Petrello
af84b25726
prevent cross site request forgery in websockets w/ the CSRF token
...
now that we have the CSRF middleware, we have a reliable token
available to us which we can use to verify individual ws_receive
payloads; this is _simpler_ than making sure you've properly configured
trusted origins, and it's also more secure than Origin header checks
see: https://github.com/ansible/tower/issues/2661
2018-07-25 09:47:53 -04:00
Christian Adams
d2d5b8ca62
Merge pull request #2664 from rooftopcellist/help_text_ext_user_tokens
...
help text for oauth ext user toggle
2018-07-25 09:20:55 -04:00
adamscmRH
12279b9631
help text for oauth ext user toggle
2018-07-25 08:54:37 -04:00
Jared Tabor
36e5300be6
Adds npm-shrinkwrap and locks down ui-router version
2018-07-24 21:05:44 -07:00
Jared Tabor
53c9c0b7f8
Merge pull request #2626 from jaredevantabor/fix-1501
...
Removes trailing slash for retrieving the scheduler partial
2018-07-24 17:44:37 -07:00
Ryan Petrello
0692b1c5ef
Merge pull request #2665 from mabashian/socket-whitelist
...
Adds websocket origin whitelist to development.py
2018-07-24 17:03:47 -04:00
mabashian
bf40dc4793
Adds websocket origin whitelist
2018-07-24 16:53:48 -04:00
Ryan Petrello
982db88349
Merge pull request #2663 from ryanpetrello/origin-verify-refactor
...
slightly refactor origin validity checks
2018-07-24 15:31:31 -04:00
