-
Notifications
You must be signed in to change notification settings - Fork 53
Conversation
Thanks for the contribution! Please ensure your commits follow our style guide. This code will be tested once a Deis maintainer reviews it. |
@helgi, @mboersma and @bacongobbler are potential reviewers of this pull request based on my analysis of |
Can not reproduce the failure which TravisCI reports :(
|
I managed to reproduce the problem. Will investigate and fix it... |
Apologies for the lack of response. Glad you sorted it out. Let us know if you need help, we're also available on slack.deis.io |
Well, the problem is caused by missing migrations for model of django_auth_ldap module. Now I in doubt of proper resolution: I don't want to import TestUser/TestProfile as an ordinary migrations as it makes no sense in production configuration (albeit in Deis v1 it was so - just checked our production installation of v1). But I also didn't find how to prohibit Django loading model of django_auto_ldap. Here how it looks in details - 'Synchronizing apps without migrations' stage is running prior to defined migrations, and 'Running deferred SQL' tries to reference auth_user which doesn't exist yet.
|
Jenkins, Add to whitelist. |
Current coverage is 87.56% (diff: 100%)@@ master #1156 diff @@
==========================================
Files 43 43
Lines 3799 3795 -4
Methods 0 0
Messages 0 0
Branches 664 661 -3
==========================================
- Hits 3327 3323 -4
Misses 308 308
Partials 164 164
|
I finally figured out that INSTALLED_APPS contains list of model for import. With django-auth-ldap there is no model except for testing module itself, so it shouldn't be included into this list. |
We need this PR, when it will be merged? |
@kmala marked it for v2.10 for review. It's jut a matter of finding the time to review it :) |
I think the last thing this PR needs is documentation at https://github.com/deis/workflow before it's ready to be merged. |
@bacongobbler this is the docs PR deis/workflow#649 |
Nice, how did I miss that?! Anyways, this looks good to me. e2e tests are passing so this will be disabled by default. |
Restore user authentication in LDAP as it was in v1 Basically it is a rollback of 2883c0c on the up2date codebase, with updated versions of involved components.
closes #1140 |
I tested this PR in our infrastructure, already. Working great. |
corresponding docs PR deis/workflow#649 |
@rvadim Thanks for the contribution. |
Bring back LDAP authentication as discussed in #1140
Basically it is a rollback of
2883c0c
on the up2date codebase, with updated versions of involved components.Changes have been tested with LDAP server, which currently works for Deis v1