John Mitchell
5a17acb131
working commit
2018-10-18 13:37:43 -04:00
Haokun-Chen
6cfd9dbfe4
refactor configuration (settings)
...
sub-nav added
2018-10-18 13:37:41 -04:00
softwarefactory-project-zuul[bot]
110c5a8e84
Merge pull request #2431 from Numblesix/devel
...
Added some Doc for ca_trust_dir
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-18 16:15:46 +00:00
Yanis Guenane
b185c1e0a2
Merge branch 'devel' into devel
2018-10-18 18:00:16 +02:00
softwarefactory-project-zuul[bot]
f1a4a62304
Merge pull request #2432 from Numblesix/ldap-doc
...
Added some Doc for FREEipa
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-18 14:53:14 +00:00
Yanis Guenane
9f3e3bad54
Merge branch 'devel' into ldap-doc
2018-10-18 16:38:31 +02:00
softwarefactory-project-zuul[bot]
56525bc34f
Merge pull request #2476 from AlanCoding/rm_changelog
...
Remove changelog
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-18 14:15:21 +00:00
Yanis Guenane
3f2068e74e
Merge branch 'devel' into ldap-doc
2018-10-18 15:53:34 +02:00
AlanCoding
6117f8297e
remove changelog
2018-10-18 09:52:08 -04:00
softwarefactory-project-zuul[bot]
8953d06905
Merge pull request #2456 from wenottingham/insert-obvious-unchained-joke-here
...
Update to latest django subminor to pick up assorted fixes.
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-18 13:50:55 +00:00
Numblesix
bf39a2a747
Added some Doc for FREEipa
2018-10-18 09:31:24 -04:00
Bill Nottingham
f27ec8cd89
Update Django version in version check.
2018-10-18 09:23:59 -04:00
Bill Nottingham
aec3244f52
Update to latest django subminor to pick up assorted fixes.
2018-10-18 09:23:57 -04:00
softwarefactory-project-zuul[bot]
07aaad53aa
Merge pull request #2037 from ikke-t/ikke-t-selinux-fix
...
fixes selinux permissions for awx data.
Reviewed-by: Shane McDonald <me@shanemcd.com>
https://github.com/shanemcd
2018-10-17 19:05:21 +00:00
Ilkka Tengvall
42a0192425
Merge branch 'devel' into ikke-t-selinux-fix
2018-10-17 21:44:48 +03:00
softwarefactory-project-zuul[bot]
ac08033d3e
Merge pull request #2472 from ryanpetrello/callback-receiver-log
...
use the proper logger for the callback receiver
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-17 15:35:32 +00:00
Numblesix
6d0fed6d9a
Added some Doc for ca_trust_dir
2018-10-17 11:32:26 -04:00
Ryan Petrello
53ae05094e
use the proper logger for the callback receiver
2018-10-17 10:56:29 -04:00
softwarefactory-project-zuul[bot]
78c4d5005e
Merge pull request #2461 from ryanpetrello/upgrade-celery-and-kombu
...
upgrade to the latest kombu + celery
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-17 13:49:37 +00:00
Ryan Petrello
79002ae563
upgrade to the latest kombu + celery
2018-10-16 16:14:58 -04:00
softwarefactory-project-zuul[bot]
6c868c7552
Merge pull request #2449 from ryanpetrello/noisy-check-migrations
...
silence the noisy error that's printed w/ `awx-manage check_migrations`
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-16 18:04:05 +00:00
Ryan Petrello
6e4f3efc4b
silence the noisy error that's printed w/ awx-manage check_migrations
2018-10-16 13:48:03 -04:00
softwarefactory-project-zuul[bot]
ce9da4edb7
Merge pull request #2454 from ryanpetrello/more-celery-cleanup
...
allow users to specify BROKER_URL with passwords that contain : and @
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-16 16:30:33 +00:00
Ryan Petrello
6ff1fe8548
allow users to specify BROKER_URL with passwords that contain : and @
2018-10-16 11:56:57 -04:00
softwarefactory-project-zuul[bot]
140b85688f
Merge pull request #2451 from matburt/fixup_test_userlaunch
...
Force openshift user behavior for uids over 2500
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-16 15:47:20 +00:00
Matthew Jones
0477581dea
Fix up flake8
2018-10-16 11:30:07 -04:00
Matthew Jones
d5c557c639
Proper parameterization for scm tests
2018-10-16 11:30:06 -04:00
Matthew Jones
8e60cb1270
Purge an unneeded ansible 2.4 version check
2018-10-16 11:30:05 -04:00
chris meyers
906eb98d8e
fixes dispatcher test that inadvertently access db
...
* Logger inadvertently triggered by dispatcher tests that do not need DB
access. Mock settings to sidestep DB access.
2018-10-16 11:30:04 -04:00
Matthew Jones
119b9475ea
Force openshift user behavior for uids over 2500
2018-10-16 11:30:04 -04:00
softwarefactory-project-zuul[bot]
12c8994faf
Merge pull request #2450 from ryanpetrello/iso-deprovision-fix
...
don't call rabbitmqctl forget_cluster_node for isolated instances
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-16 14:10:35 +00:00
Ryan Petrello
f3e73bbed8
don't call rabbitmqctl forget_cluster_node for isolated instances
2018-10-16 09:47:53 -04:00
softwarefactory-project-zuul[bot]
e2a1b7902c
Merge pull request #2439 from jmferrer/change_openshift_vars_path
...
Change openshift vars path.
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-16 12:17:51 +00:00
jmferrer
d65a3fa037
Restore per-deployment requirements.
2018-10-16 09:59:11 +02:00
jmferrer
f6600887bc
Merge branch 'devel' of https://github.com/jmferrer/awx into change_openshift_vars_path
2018-10-16 09:55:05 +02:00
Michael Abashian
96c18fa311
Merge pull request #2141 from mabashian/remove-system-tracking
...
Removes system tracking code from the UI
2018-10-15 18:55:34 -06:00
mabashian
9645e5bcd3
Remove portalMode accidental portalMode inclusion that resulted from merge conflict
2018-10-15 18:50:58 -04:00
mabashian
0a09d98fe8
Removes system tracking code from the UI. Moves import of shared out to app.js
2018-10-15 18:50:58 -04:00
Ryan Petrello
1224e2c889
Merge pull request #2440 from ryanpetrello/fix-list-based-survey-choices
...
remove over-eager survey choices validation
2018-10-15 17:05:06 -04:00
softwarefactory-project-zuul[bot]
c8e6fa3bb3
Merge pull request #2438 from ryanpetrello/dispatcher-quit-race
...
don't attempt to recover special QUIT messages in the worker pool recovery code
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-15 20:40:20 +00:00
Ryan Petrello
00cae104b3
remove over-eager survey choices validation
...
it looks like choices can also be a list and _maybe_ comma delimited;
clearly there's a lot of history here; let's verify and test what's _really_ supported and _then_ add any necessary validation
2018-10-15 16:40:17 -04:00
jmferrer
f27a34cd1c
Change openshift vars path.
2018-10-15 18:27:49 +02:00
Ryan Petrello
720a634702
don't attempt to recover special QUIT messages in the worker pool
...
when `--reload` is sent to the dispatcher, it sends a special QUIT
message to each worker in the pool so that it will exit gracefully at
the next opportunity
when a worker process exits unexpectedly, the dispatcher attempts to
recover its queued messages and sends them to another worker in the
pool; in this scenario, we should _never_ re-enqueue these special
QUIT messages (because the process doesn't need to quit, it's already
gone)
To reproduce this race condition:
1. Launch an adhoc that does `sleep 60`
2. Run `awx-manage run_dispatcher --reload` to enqueue a `QUIT` message
into the worker's queue
3. Find the pid of the worker running the `sleep 60` and `SIGKILL` it.
4. Observe that dispatcher attempts to requeue the `QUIT` message and
logs a confusing error.
2018-10-15 12:17:52 -04:00
Chris Meyers
c722e50595
Merge pull request #2425 from chrismeyersfsu/fix-ldap_group_type
...
fix issue with ldap queries containing unicode
2018-10-15 10:49:43 -05:00
softwarefactory-project-zuul[bot]
1cecfd9771
Merge pull request #2437 from ryanpetrello/fix-3039
...
fix a typo on the JT add page that breaks the custom venv field
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-15 15:19:08 +00:00
Ryan Petrello
011c8ae822
fix a typo on the JT add page that breaks the custom venv field
2018-10-15 11:04:31 -04:00
softwarefactory-project-zuul[bot]
73f54b2237
Merge pull request #2373 from marshmalien/always_nodes_ui
...
Display WF always nodes in conjunction with success and failure
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-12 22:43:32 +00:00
softwarefactory-project-zuul[bot]
0a964b2bf6
Merge pull request #2266 from ansible/celery-tastes-bad
...
replace the celery-based task queue with a kombu-based implementation
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-12 18:40:54 +00:00
softwarefactory-project-zuul[bot]
fa18b94725
Merge pull request #2429 from ryanpetrello/more-shippable-cleanup
...
more shippable -> zuul cleanup
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-12 16:10:53 +00:00
softwarefactory-project-zuul[bot]
5ab6255c67
Merge pull request #2424 from ryanpetrello/oauth-toolkit-upgrade
...
update to the latest stable 1.1 django-oauth-toolkit
Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2018-10-12 15:54:36 +00:00
