openstack/magnum
Code Issues Proposed changes

Fix gate for client and devstack

Browse Source 
These two changes have to merge together to pass the gate.

Update import because of magnum client change
  Magnum client has moved out apiclient and cliutils from
  oslo-incubator, update the import reference here.
  Refer to:
    https://review.openstack.org/#/c/280050
  for magnumclient change.

Change SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME
  Devstack is converting from TENANT to PROJECT[1]. This patch changes
  SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME in the devstack plugin to
  match.

[1] https://review.openstack.org/#/c/281779/

Change-Id: Ib03e421e48a3aa40c11cbc892a3ca724cbd644e7
Closes-Bug: #1548634
Co-Authored-By: Yang Hongyang <hongyang.yang@easystack.cn>
This commit is contained in:
Corey O'Brien
2016-02-15 11:57:53 +08:00
parent 39288ea1dd
commit 8270d3cc7a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/magnum
View File

@@ -100,7 +100,7 @@ function configure_magnum {
#
# Project User Roles
# ------------------------------------------------------------------
# SERVICE_TENANT_NAME magnum service
# SERVICE_PROJECT_NAME magnum service
function create_magnum_accounts {
create_service_user "magnum" "admin"
@@ -136,7 +136,7 @@ function create_magnum_conf {
iniset $MAGNUM_CONF keystone_authtoken admin_user magnum
iniset $MAGNUM_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
iniset $MAGNUM_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $MAGNUM_CONF keystone_authtoken admin_tenant_name $SERVICE_PROJECT_NAME
configure_auth_token_middleware $MAGNUM_CONF magnum $MAGNUM_AUTH_CACHE_DIR

4
magnum/tests/functional/python_client_base.py
View File

@@ -27,8 +27,8 @@ from six.moves import configparser
from magnum.common.utils import rmtree_without_raise
from magnum.tests import base
from magnumclient.openstack.common.apiclient import exceptions
from magnumclient.openstack.common import cliutils
from magnumclient.common.apiclient import exceptions
from magnumclient.common import cliutils
from magnumclient.v1 import client as v1client

2
magnum/tests/functional/swarm/test_swarm_python_client.py
View File

@@ -17,7 +17,7 @@ from requests import exceptions as req_exceptions
from magnum.common import docker_utils
from magnum.tests.functional.python_client_base import BayTest
from magnumclient.openstack.common.apiclient import exceptions
from magnumclient.common.apiclient import exceptions
CONF = cfg.CONF