From 24192457c089faaa780398e87a214a7e04f0ac62 Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Fri, 23 Oct 2015 12:28:32 +0300 Subject: [PATCH] Use default Keystone API version in Devstack 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 --- devstack/plugin.sh | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 295a88b166..3ba3f97f92 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -461,23 +461,9 @@ function create_default_share_type { enabled_backends=(${MANILA_ENABLED_BACKENDS//,/ }) driver_handles_share_servers=$(iniget $MANILA_CONF ${enabled_backends[0]} driver_handles_share_servers) - manila \ - --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 + manila type-create $MANILA_DEFAULT_SHARE_TYPE $driver_handles_share_servers if [[ $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS ]]; then - manila \ - --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 + manila type-key $MANILA_DEFAULT_SHARE_TYPE set $MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS fi }