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
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
Wayne Witzel III
73f0a0d147
Update to latest asgi-amqp
2018-02-28 14:43:37 -05:00
Cédric Levasseur
a2d543eb3b
Inserting a note about PostgreSQL minimal version 9.4 in installation doc ( #1385 )
...
* Minimal postgresql version
* moving the Postgresql minimal version note.
* moved to System requirements and 'minimal' replaced by 'minimum'.
2018-02-28 13:44:50 -05:00
Shane McDonald
7087341570
Merge pull request #1397 from shanemcd/devel
...
Fix celery 3 broker url reference in standalone docker install
2018-02-28 12:50:57 -05:00
Shane McDonald
0e9a8d5592
Fix celery 3 broker url reference
2018-02-28 12:47:05 -05:00
Alan Rominger
4fba2d61e6
Merge pull request #1394 from AlanCoding/text_type2
...
Prevent unicode bug in job_explanation
2018-02-28 12:42:11 -05:00
AlanCoding
54c0436959
prevent unicode bug in job_explanation
2018-02-28 11:01:20 -05:00
Alan Rominger
ee0e239a9e
Merge pull request #1374 from AlanCoding/your_name
...
More consistent representations of model objects
2018-02-28 09:08:29 -05:00
Matthew Jones
dc4b9341da
Merge pull request #1383 from jakemcdermott/401-on-invalid-login
...
issue a 401 on invalid login
2018-02-28 08:35:11 -05:00
Jake McDermott
75a27f2457
issue 401 on invalid login
2018-02-28 02:02:52 -05:00
Jake McDermott
ee20fc478b
add test for invalid login
2018-02-28 02:02:39 -05:00
Jake McDermott
01ee2adf30
Merge pull request #1382 from jakemcdermott/cookie-settings
...
adding in default session cookie setting for docker stand alone
2018-02-27 20:42:46 -05:00
Jake McDermott
877cde9a7f
add default cookie settings
2018-02-27 20:40:41 -05:00
Ryan Petrello
b5a46c346d
Merge pull request #1379 from ryanpetrello/fix-1366
...
don't inject custom extra_vars for inventory updates
2018-02-27 17:00:22 -05:00
Christian Adams
6e39388090
Merge pull request #1380 from rooftopcellist/csrf_flag
...
adds csrf flag to support http
2018-02-27 16:36:23 -05:00
Christian Adams
47c4eb38df
Merge pull request #1377 from rooftopcellist/remove_authtoken_model
...
Removes Auth token
2018-02-27 16:33:20 -05:00
adamscmRH
69f8304643
adds csrf flag to support http
2018-02-27 16:19:46 -05:00
adamscmRH
40d563626e
removes authtoken
2018-02-27 16:12:13 -05:00
Ryan Petrello
b9ab06734d
don't inject custom extra_vars for inventory updates
...
see: https://github.com/ansible/awx/issues/1366
2018-02-27 16:10:23 -05:00
Chris Meyers
d551566b4d
Merge pull request #1372 from chrismeyersfsu/old-celery3
...
celery 4.x to 3.x roll back
2018-02-27 15:26:46 -05:00
chris meyers
6606a29f57
celery 4.x -> 3.x change route config name
2018-02-27 14:13:05 -05:00
Jake McDermott
f9129aefba
Merge pull request #1361 from mabashian/1279-preview-credentials
...
Put credentials on their own line in the launch preview
2018-02-27 13:42:00 -05:00
AlanCoding
bacd895705
more consistent representations of model objects
2018-02-27 12:18:57 -05:00
