commit f39ee96f1dc7fae9aaad194669467a7f9fcc3d31
author Jorge Valderrama Romero <jorge.valderrama@stackops.com> Mon Sep 02 17:18:40 2013 +0200
committer Jorge Valderrama Romero <jorge.valderrama@stackops.com> Mon Sep 02 17:54:27 2013 +0200
tree 4e5bfb820a1c1d932fb533b10617fa82a5ae671d
parent e45a6af7e8e86e6d95110a65083659ed924012c3

Fix deprecated params user_id, role_id, tenant_id

Update keystone cli by changing parameter options (user_id, role_id and tenant_id)
to use '-' rather than '_' in the method user_role_add and consequently the method
user_role_remove without maintain backward compatibility because these are deprecated.

python-keystoneclient - Bug #1150434
Change-Id: Ia5113718eb050cf7dba443b8d0caf3bdaa1730f0

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 826b958..b30829f 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -335,9 +335,9 @@
             --email=cinder@example.com \
             | grep " id " | get_field 2)
         keystone user-role-add \
-            --tenant_id $SERVICE_TENANT \
-            --user_id $CINDER_USER \
-            --role_id $ADMIN_ROLE
+            --tenant-id $SERVICE_TENANT \
+            --user-id $CINDER_USER \
+            --role-id $ADMIN_ROLE
         if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
             CINDER_SERVICE=$(keystone service-create \
                 --name=cinder \