From 01a5c3d4a7310ef29bea74caebadcafd77ff5f36 Mon Sep 17 00:00:00 2001 From: f3flight Date: Sat, 14 May 2016 01:01:09 +0000 Subject: [PATCH] Fix keystone CLI deprecation warnings --- rq/scripts/keystone-endpoint-list | 8 +++++++- rq/scripts/keystone-tenant-list | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rq/scripts/keystone-endpoint-list b/rq/scripts/keystone-endpoint-list index 9fd9fee..230c3ef 100644 --- a/rq/scripts/keystone-endpoint-list +++ b/rq/scripts/keystone-endpoint-list @@ -1,2 +1,8 @@ source "$OPENRC" -keystone endpoint-list +which openstack 2>&1 +if [ "$?" -eq "0" ] +then + openstack endpoint list --long +else + keystone endpoint-list +fi diff --git a/rq/scripts/keystone-tenant-list b/rq/scripts/keystone-tenant-list index 8ad5e03..7b64bf5 100644 --- a/rq/scripts/keystone-tenant-list +++ b/rq/scripts/keystone-tenant-list @@ -1,2 +1,8 @@ source "$OPENRC" -keystone tenant-list +which openstack 2>&1 +if [ "$?" -eq 0 ] +then + openstack project list --long +else + keystone tenant-list +fi