Skip to content

Compare against a list not a string #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alop merged 2 commits into from
Jan 12, 2015
Merged

Compare against a list not a string #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7723825
Compare against a list not a string
retr0h Jan 5, 2015
2d85f50
Switched to `ListOpt`
retr0h Jan 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions keystone/identity/backends/hybrid-idm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
from keystone.identity.backends import sql
from keystone.identity.backends import ldap
from keystone.openstack.common import log as logging
from keystone import config
from oslo.config import cfg
from keystone import config as ks_cfg
from keystone.common.ldap import core
import uuid
import re

CONF = config.CONF
CONF = ks_cfg.CONF
ks_cfg.CONF.register_opt(cfg.ListOpt('builtin_users'), group='ldap')

DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
LDAP_BIND_USER = CONF.ldap.user
LDAP_BIND_PASSWORD = CONF.ldap.password
Expand Down
7 changes: 5 additions & 2 deletions keystone/identity/backends/hybrid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
from keystone.identity.backends import sql
from keystone.identity.backends import ldap
from keystone.openstack.common import log as logging
from keystone import config
from oslo.config import cfg
from keystone import config as ks_cfg
from keystone.common.ldap import core
import uuid
import re

CONF = config.CONF
CONF = ks_cfg.CONF
ks_cfg.CONF.register_opt(cfg.ListOpt('builtin_users'), group='ldap')

DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
LDAP_BIND_USER = CONF.ldap.user
LDAP_BIND_PASSWORD = CONF.ldap.password
Expand Down