openstack
/
fuxi
Code Issues Proposed changes

Revert "Move from "tenant" to "project"" 

This patch broke Fuxi since Fuxi doesn't support Keystone v3
yet. Let's revert it for now.

This reverts commit 7d8c708959.

Change-Id: I4ecd10fee820fc6152b52b1d432967e66b48bbfc
This commit is contained in:
Hongbin Lu 2016-12-13 00:10:33 +00:00
parent 89265e72ca
commit 58af54cfc8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/installation.rst
View File

@ -59,7 +59,7 @@ After installing Fuxi, there will generate a configuration file `/etc/fuxi/fuxi.
auth_url = AUTH_URL
admin_user = ADMIN_USER
admin_password = ADMIN_PASSWORD
admin_project_name = ADMIM_PROJECT_NAME
admin_tenant_name = ADMIM_TENANT_NAME
* Cinder section

4
fuxi/common/config.py
View File

@ -55,9 +55,9 @@ keystone_opts = [
cfg.StrOpt('admin_user',
default=os.environ.get('SERVICE_USER'),
help=_('The username to auth with the identity service.')),
cfg.StrOpt('admin_project_name',
cfg.StrOpt('admin_tenant_name',
default=os.environ.get('SERVICE_TENANT_NAME'),
help=_('The project name to auth with the identity service.')),
help=_('The tenant name to auth with the identity service.')),
cfg.StrOpt('admin_password',
default=os.environ.get('SERVICE_PASSWORD'),
help=_('The password to auth with the identity service.')),

2
fuxi/utils.py
View File

@ -146,7 +146,7 @@ def get_keystone_session(**kwargs):
config['auth_url'] = keystone_conf.auth_url
config['username'] = keystone_conf.admin_user
config['password'] = keystone_conf.admin_password
config['project_name'] = keystone_conf.admin_project_name
config['tenant_name'] = keystone_conf.admin_tenant_name
config['token'] = keystone_conf.admin_token
config.update(kwargs)