Christian Adams
095515bb56
Merge pull request #1458 from rooftopcellist/fix_expiration
...
Fix expiration
2018-03-07 08:13:25 -05:00
adamscmRH
efaa698939
fix token expiration time
2018-03-07 00:42:44 -05:00
AlanCoding
556e6c4a11
Dependency Updates
...
Upgrades of minor dependency upgrades
Inventory scripts were upgraded in separate commit
Major exclusions from this update
- celery was already downgraded for other reasons
- Django / DRF major update already done, minor bumps here
- asgi-amqp has fixes coming independently, not touched
- TACACS plus added features not needed
Removals of note
- remove shade from AWX requirements
- remove kombu from Ansible requirements
Other notes
Add note about pinning setuptools and pip,
done but not mentioned previously
Stop pinning gevent-websocket and twisted
upgrade Azure to Ansible core requirements
more detailed notes
https://gist.github.com/AlanCoding/9442a512ab6977940bc7b5b346d4f70b
upgrade version of Django for Exception
2018-03-06 16:04:01 -05:00
Matthew Jones
8421d2b0d2
Merge pull request #1457 from matburt/remove_old_migrations
...
Remove old south migrations from before a previous django upgrade
2018-03-06 12:59:32 -08:00
Jake McDermott
f8ca0a613f
Update prompt.block.less
2018-03-06 14:56:38 -05:00
Christian Adams
db91e30464
Merge pull request #1449 from rooftopcellist/fix_exp_time
...
fix token expiration time
2018-03-06 14:55:38 -05:00
Matthew Jones
d19ef60d97
Remove old south migrations from before a previous django upgrade
2018-03-06 14:47:09 -05:00
Jake McDermott
5971d79a8f
auto hide multi credential scrollbar
2018-03-06 14:33:28 -05:00
Wayne Witzel III
a3b2f29478
Merge pull request #1454 from wwitzel3/fix-role-summary
...
Fix role summary when role description is overloaded
2018-03-06 14:03:22 -05:00
adamscmRH
a80e3855cd
fix token expiration time
2018-03-06 13:22:12 -05:00
Wayne Witzel III
8dce5c826c
Fix role summary when role description is overloaded
2018-03-06 13:07:29 -05:00
Demin, Petr
f4a241aba2
Constrain requests
2018-03-06 12:47:34 -05:00
Jake McDermott
105b4982c4
Merge pull request #1451 from tburko/devel
...
Fix "System settings panel form is not rendering #1440 "
2018-03-06 11:15:16 -05:00
Alan Rominger
cc33109412
Merge pull request #1445 from AlanCoding/platform
...
Add platform to ec2 group by options
2018-03-06 07:23:22 -05:00
Taras Burko
8a5cd3ec7d
Fix "System settings panel form is not rendering #1440 "
2018-03-06 14:03:36 +02:00
Ryan Petrello
d6af0bfd50
Merge pull request #1448 from ryanpetrello/fix-7923
...
normalize custom_virtualenv empty values to null
2018-03-05 17:25:51 -05:00
Ryan Petrello
8955e6bc1c
normalize custom_virtualenv empty values to null
...
see: https://github.com/ansible/ansible-tower/issues/7923
2018-03-05 17:05:10 -05:00
Shane McDonald
61087940c5
Merge pull request #1446 from matburt/fix_kubernetes_configmap
...
Apply celery rollback changes to kubernetes configmap
2018-03-05 16:46:57 -05:00
Matthew Jones
e99184656e
Apply rabbitmq and setting kubernetes changes post-celery rollback
2018-03-05 16:22:27 -05:00
AlanCoding
341e2c0fe2
add platform to ec2 group by options
2018-03-05 15:43:28 -05:00
Matthew Jones
105b82c436
Apply celery rollback changes to kubernetes configmap
2018-03-05 15:32:24 -05:00
Ryan Petrello
1596b2907b
Merge pull request #1439 from ryanpetrello/fix-7923
...
add validation to InventorySource.inventory to avoid task manager death
2018-03-05 15:12:24 -05:00
Marliana Lara
18f3c79bc3
Denote invalid job templates and scheduled jobs by displaying a red invalid bar
2018-03-05 14:52:40 -05:00
Ryan Petrello
8887be5952
add validation to InventorySource.inventory to avoid task manager death
...
see: https://github.com/ansible/awx/issues/1438
2018-03-05 14:40:57 -05:00
Shane McDonald
44f6423af3
Merge pull request #1442 from ryanpetrello/devel
...
fix busted shippable builds
2018-03-05 14:38:35 -05:00
Chris Meyers
80a970288d
Merge pull request #1443 from chrismeyersfsu/fix-named_urls
...
handle 404 returned by resolve()
2018-03-05 14:37:07 -05:00
chris meyers
ccfb6d64bf
handle 404 returned by resolve()
...
* related to https://github.com/ansible/ansible-tower/issues/7926
* if 404 on url in migration loading middelware, do NOT short circuit
middleware. Simply call the normal middlware code path in this case.
2018-03-05 14:34:53 -05:00
Ryan Petrello
13672cc88c
fix busted shippable builds
2018-03-05 14:16:42 -05:00
Shane McDonald
d5773c58d3
Merge pull request #1426 from chrismeyersfsu/fix-migration_in_progress
...
short-circuit middleware if migration loading url
2018-03-03 10:48:50 -05:00
Jake McDermott
5370c5e07d
Merge pull request #1431 from wenottingham/check-check-check-it-out
...
Adjust some wording in the UI.
2018-03-02 21:07:18 -05:00
Bill Nottingham
1606380f61
Adjust some wording in the UI.
...
Attempt to make the 'scm update' vs 'scm checkout' more clear.
Remove 'future' from scheduling tooltips (superfluous).
2018-03-02 19:54:02 -05:00
Christian Adams
953850a0d7
Merge pull request #1427 from rooftopcellist/hide_client_secret
...
Hide client_secret from activity stream
2018-03-02 15:43:49 -05:00
adamscmRH
701a5c9a36
hides client_secret from act stream
2018-03-02 14:47:49 -05:00
chris meyers
36d59651af
inherit rather than monkey patch
...
* Enable migration in progress page in ALL environments
2018-03-02 12:37:48 -05:00
Christian Adams
d1319b7394
Merge pull request #1414 from rooftopcellist/testing_oauth
...
fix token creation at `api/o/token`
2018-03-02 11:36:59 -05:00
chris meyers
746a2c1eea
short-circuit middleware if migration loading url
...
* Had to monkey patch django middleware logic.
* Left checks to tell coders to use new middleware behavior in favor of
monkey patching.
2018-03-02 11:21:26 -05:00
Chris Meyers
9df76f963b
Merge pull request #1412 from chrismeyersfsu/reap_new_nodes_too
...
reap all nodes that havn't checked in
2018-03-02 10:03:37 -05:00
chris meyers
17de084d04
perform the min needed DB ops to offline a node
...
* Don't do an extra save to the DB that could conflict with another
heartbeat when it isn't needed since we will be deleting the node
anyway.
2018-03-02 07:57:59 -05:00
Chris Meyers
f907995374
Merge pull request #1417 from chrismeyersfsu/fix-config_watcher
...
invoke main() in config watcher script
2018-03-01 17:11:58 -05:00
chris meyers
b69315f2eb
fix up the config map watcher script
...
* invoke main() in config watcher script
* correctly call hash update by passing the filename
2018-03-01 17:06:07 -05:00
chris meyers
a3a618d733
call node init procedures as early as possible
...
* invoke the first heartbeat as early as possible. Results in a much
better user experience where when a user scales up an awx node, the node
appears with capacity earlier.
2018-03-01 17:05:58 -05:00
adamscmRH
fa7647f828
fix token creation
2018-03-01 16:19:58 -05:00
Chris Meyers
8c1ec37c80
Merge pull request #1411 from chrismeyersfsu/early_first_heartbeat
...
call node init procedures as early as possible
2018-03-01 13:01:37 -05:00
Jake McDermott
d7616accf5
Improve documentation for AWX E2E ( #1381 )
...
* Improve documentation for AWX E2E
2018-03-01 12:00:16 -05:00
chris meyers
5c647c2a0d
call node init procedures as early as possible
...
* invoke the first heartbeat as early as possible. Results in a much
better user experience where when a user scales up an awx node, the node
appears with capacity earlier.
2018-03-01 11:24:45 -05:00
chris meyers
e94bd128b8
reap all nodes that havn't checked in
...
* Before this change we would exclude the reaping of new nodes. With
this change, new nodes will be considered for reaping just like old
nodes.
2018-03-01 11:21:54 -05:00
Alan Rominger
8d57b84251
Merge pull request #1353 from AlanCoding/dep_scripts
...
Update inventory scripts
2018-03-01 10:56:11 -05:00
Chris Meyers
f18d99d7a9
Merge pull request #1409 from chrismeyersfsu/openshift_runtime_rabbitmq_cookie
...
dynamically set rabbitmq cookie
2018-03-01 09:57:11 -05:00
chris meyers
9436e8ae25
dynamically set rabbitmq cookie
2018-03-01 09:23:45 -05:00
Wayne Witzel III
dba78e6bfb
Merge pull request #1398 from wwitzel3/devel
...
Update to latest asgi-amqp
2018-02-28 15:20:55 -05:00
