openstack/deb-manila
Code Issues Proposed changes

Use default Keystone API version in Devstack

Browse Source 
Right now devstack plugin has old workaround for python-manilaclient
that sets usage of Keystone v2 API for Manila requests.
So, remove it as it is not needed anymore since
python-manilaclient release 1.5.0 that supports Keystone API v3.

Change-Id: I42ce87ed6414b9048e49e24e5368a3f78c79acc5
This commit is contained in:
Valeriy Ponomaryov 2015-10-23 12:28:32 +03:00
parent 7523165b56
commit 24192457c0
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devstack/plugin.sh
View File

@ -461,23 +461,9 @@ function create_default_share_type {
enabled_backends=(${MANILA_ENABLED_BACKENDS//,/ }) enabled_backends=(${MANILA_ENABLED_BACKENDS//,/ })
driver_handles_share_servers=$(iniget $MANILA_CONF ${enabled_backends[0]} driver_handles_share_servers) driver_handles_share_servers=$(iniget $MANILA_CONF ${enabled_backends[0]} driver_handles_share_servers)
manila \ manila type-create $MANILA_DEFAULT_SHARE_TYPE $driver_handles_share_servers
--debug \
--os-auth-url $KEYSTONE_AUTH_URI/v2.0 \
--os-tenant-name ${OS_PROJECT_NAME:-$OS_TENANT_NAME} \
--os-username $OS_USERNAME \
--os-password $OS_PASSWORD \
--os-region-name $OS_REGION_NAME \
type-create $MANILA_DEFAULT_SHARE_TYPE $driver_handles_share_servers
if [[ $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS ]]; then if [[ $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS ]]; then
manila \ manila type-key $MANILA_DEFAULT_SHARE_TYPE set $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS
--debug \
--os-auth-url $KEYSTONE_AUTH_URI/v2.0 \
--os-tenant-name ${OS_PROJECT_NAME:-$OS_TENANT_NAME} \
--os-username $OS_USERNAME \
--os-password $OS_PASSWORD \
--os-region-name $OS_REGION_NAME \
type-key $MANILA_DEFAULT_SHARE_TYPE set $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS
fi fi
} }