Rename tenant to project in functional test
Rename "admin_tenant_name" to "admin_project_name" and
rename "tenant_name" to "project_name". These configs have been
renamed in tempest [1], so Magnum needs to adapt the change.
In addition, enable the required devstack plugins in gate hook,
since they has been removed from project-config [2].
[1] https://review.openstack.org/#/c/301167/
[2] https://review.openstack.org/#/c/305475/
Change-Id: I41438cbfaefd9d04d7e73a4f46f5ece1494b349c
Closes-Bug: #1567691
(partially pick from commit b8324f0d72
)
This commit is contained in:
parent
c0c2bdb2c5
commit
fff3c0c08c
|
@ -69,7 +69,7 @@ Here's a reasonable sample of tempest.conf settings you might need::
|
|||
test_accounts_file=/tmp/etc/magnum/accounts.yaml
|
||||
admin_username=admin
|
||||
admin_password=password
|
||||
admin_tenant_name=admin
|
||||
admin_project_name=admin
|
||||
|
||||
[identity]
|
||||
disable_ssl_certificate_validation=True
|
||||
|
|
|
@ -17,6 +17,10 @@
|
|||
|
||||
coe=$1
|
||||
|
||||
export PROJECTS="openstack/barbican $PROJECTS"
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
||||
|
||||
if [ "$coe" = "mesos" ]; then
|
||||
echo "MAGNUM_GUEST_IMAGE_URL="https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2"" >> $BASE/new/devstack/localrc
|
||||
fi
|
||||
|
|
|
@ -24,14 +24,14 @@ class Config(object):
|
|||
def set_admin_creds(cls, config):
|
||||
cls.admin_user = CONF.auth.admin_username
|
||||
cls.admin_passwd = CONF.auth.admin_password
|
||||
cls.admin_tenant = CONF.auth.admin_tenant_name
|
||||
cls.admin_tenant = CONF.auth.admin_project_name
|
||||
|
||||
@classmethod
|
||||
def set_user_creds(cls, config):
|
||||
# normal user creds
|
||||
cls.user = CONF.identity.username
|
||||
cls.passwd = CONF.identity.password
|
||||
cls.tenant = CONF.identity.tenant_name
|
||||
cls.tenant = CONF.identity.project_name
|
||||
|
||||
@classmethod
|
||||
def set_auth_version(cls, config):
|
||||
|
|
Loading…
Reference in New Issue