1. devstack
  2. Commit f39ee96f1dc7fae9aaad194669467a7f9fcc3d31
Browse code

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

Jorge Valderrama Romero authored on 2013/09/03 00:18:40
Showing 6 changed files
files/keystone_data.sh
History View file @ f39ee96
... ... 
@@ -58,9 +58,9 @@ if [[ "$ENABLED_SERVICES" =~ "n-api" ]] && [[ "$ENABLED_SERVICES" =~ "s-proxy" |
58 58 
     # Nova needs ResellerAdmin role to download images when accessing
59 59 
     # swift through the s3 api.
60 60 
     keystone user-role-add \
61 
-        --tenant_id $SERVICE_TENANT \
62 
-        --user_id $NOVA_USER \
63 
-        --role_id $RESELLER_ROLE
61 
+        --tenant-id $SERVICE_TENANT \
62 
+        --user-id $NOVA_USER \
63 
+        --role-id $RESELLER_ROLE
64 64 
 fi
65 65
66 66 
 # Heat
... ... 
@@ -69,9 +69,9 @@ if [[ "$ENABLED_SERVICES" =~ "heat" ]]; then
69 69 
                                               --pass="$SERVICE_PASSWORD" \
70 70 
                                               --tenant_id $SERVICE_TENANT \
71 71 
                                               --email=heat@example.com)
72 
-    keystone user-role-add --tenant_id $SERVICE_TENANT \
73 
-                           --user_id $HEAT_USER \
74 
-                           --role_id $SERVICE_ROLE
72 
+    keystone user-role-add --tenant-id $SERVICE_TENANT \
73 
+                           --user-id $HEAT_USER \
74 
+                           --role-id $SERVICE_ROLE
75 75 
     # heat_stack_user role is for users created by Heat
76 76 
     keystone role-create --name heat_stack_user
77 77 
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
... ... 
@@ -106,9 +106,9 @@ if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
106 106 
         --tenant_id $SERVICE_TENANT \
107 107 
         --email=glance@example.com)
108 108 
     keystone user-role-add \
109 
-        --tenant_id $SERVICE_TENANT \
110 
-        --user_id $GLANCE_USER \
111 
-        --role_id $ADMIN_ROLE
109 
+        --tenant-id $SERVICE_TENANT \
110 
+        --user-id $GLANCE_USER \
111 
+        --role-id $ADMIN_ROLE
112 112 
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
113 113 
         GLANCE_SERVICE=$(get_id keystone service-create \
114 114 
             --name=glance \
... ... 
@@ -129,13 +129,13 @@ if [[ "$ENABLED_SERVICES" =~ "ceilometer" ]]; then
129 129 
                                               --pass="$SERVICE_PASSWORD" \
130 130 
                                               --tenant_id $SERVICE_TENANT \
131 131 
                                               --email=ceilometer@example.com)
132 
-    keystone user-role-add --tenant_id $SERVICE_TENANT \
133 
-                           --user_id $CEILOMETER_USER \
134 
-                           --role_id $ADMIN_ROLE
132 
+    keystone user-role-add --tenant-id $SERVICE_TENANT \
133 
+                           --user-id $CEILOMETER_USER \
134 
+                           --role-id $ADMIN_ROLE
135 135 
     # Ceilometer needs ResellerAdmin role to access swift account stats.
136 
-    keystone user-role-add --tenant_id $SERVICE_TENANT \
137 
-                           --user_id $CEILOMETER_USER \
138 
-                           --role_id $RESELLER_ROLE
136 
+    keystone user-role-add --tenant-id $SERVICE_TENANT \
137 
+                           --user-id $CEILOMETER_USER \
138 
+                           --role-id $RESELLER_ROLE
139 139 
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
140 140 
         CEILOMETER_SERVICE=$(get_id keystone service-create \
141 141 
             --name=ceilometer \
... ... 
@@ -192,7 +192,7 @@ if [[ "$ENABLED_SERVICES" =~ "tempest" ]]; then
192 192 
         --pass="$ADMIN_PASSWORD" \
193 193 
         --email=alt_demo@example.com)
194 194 
     keystone user-role-add \
195 
-        --tenant_id $ALT_DEMO_TENANT \
196 
-        --user_id $ALT_DEMO_USER \
197 
-        --role_id $MEMBER_ROLE
195 
+        --tenant-id $ALT_DEMO_TENANT \
196 
+        --user-id $ALT_DEMO_USER \
197 
+        --role-id $MEMBER_ROLE
198 198 
 fi
lib/cinder
History View file @ f39ee96
... ... 
@@ -335,9 +335,9 @@ create_cinder_accounts() {
335 335 
             --email=cinder@example.com \
336 336 
             | grep " id " | get_field 2)
337 337 
         keystone user-role-add \
338 
-            --tenant_id $SERVICE_TENANT \
339 
-            --user_id $CINDER_USER \
340 
-            --role_id $ADMIN_ROLE
338 
+            --tenant-id $SERVICE_TENANT \
339 
+            --user-id $CINDER_USER \
340 
+            --role-id $ADMIN_ROLE
341 341 
         if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
342 342 
             CINDER_SERVICE=$(keystone service-create \
343 343 
                 --name=cinder \
lib/keystone
History View file @ f39ee96
... ... 
@@ -217,9 +217,9 @@ create_keystone_accounts() {
217 217 
         --name admin \
218 218 
         | grep " id " | get_field 2)
219 219 
     keystone user-role-add \
220 
-        --user_id $ADMIN_USER \
221 
-        --role_id $ADMIN_ROLE \
222 
-        --tenant_id $ADMIN_TENANT
220 
+        --user-id $ADMIN_USER \
221 
+        --role-id $ADMIN_ROLE \
222 
+        --tenant-id $ADMIN_TENANT
223 223
224 224 
     # service
225 225 
     SERVICE_TENANT=$(keystone tenant-create \
... ... 
@@ -244,10 +244,10 @@ create_keystone_accounts() {
244 244 
         --pass "$ADMIN_PASSWORD" \
245 245 
         --email demo@example.com \
246 246 
         | grep " id " | get_field 2)
247 
-    keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id $DEMO_TENANT
248 
-    keystone user-role-add --user_id $ADMIN_USER --role_id $ADMIN_ROLE --tenant_id $DEMO_TENANT
249 
-    keystone user-role-add --user_id $DEMO_USER --role_id $ANOTHER_ROLE --tenant_id $DEMO_TENANT
250 
-    keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id $INVIS_TENANT
247 
+    keystone user-role-add --user-id $DEMO_USER --role-id $MEMBER_ROLE --tenant-id $DEMO_TENANT
248 
+    keystone user-role-add --user-id $ADMIN_USER --role-id $ADMIN_ROLE --tenant-id $DEMO_TENANT
249 
+    keystone user-role-add --user-id $DEMO_USER --role-id $ANOTHER_ROLE --tenant-id $DEMO_TENANT
250 
+    keystone user-role-add --user-id $DEMO_USER --role-id $MEMBER_ROLE --tenant-id $INVIS_TENANT
251 251
252 252 
     # Keystone
253 253 
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
lib/neutron
History View file @ f39ee96
... ... 
@@ -301,9 +301,9 @@ function create_neutron_accounts() {
301 301 
             --email=neutron@example.com \
302 302 
             | grep " id " | get_field 2)
303 303 
         keystone user-role-add \
304 
-            --tenant_id $SERVICE_TENANT \
305 
-            --user_id $NEUTRON_USER \
306 
-            --role_id $ADMIN_ROLE
304 
+            --tenant-id $SERVICE_TENANT \
305 
+            --user-id $NEUTRON_USER \
306 
+            --role-id $ADMIN_ROLE
307 307 
         if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
308 308 
             NEUTRON_SERVICE=$(keystone service-create \
309 309 
                 --name=neutron \
lib/nova
History View file @ f39ee96
... ... 
@@ -399,9 +399,9 @@ create_nova_accounts() {
399 399 
             --email=nova@example.com \
400 400 
             | grep " id " | get_field 2)
401 401 
         keystone user-role-add \
402 
-            --tenant_id $SERVICE_TENANT \
403 
-            --user_id $NOVA_USER \
404 
-            --role_id $ADMIN_ROLE
402 
+            --tenant-id $SERVICE_TENANT \
403 
+            --user-id $NOVA_USER \
404 
+            --role-id $ADMIN_ROLE
405 405 
         if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
406 406 
             NOVA_SERVICE=$(keystone service-create \
407 407 
                 --name=nova \
lib/swift
History View file @ f39ee96
... ... 
@@ -464,7 +464,7 @@ function create_swift_accounts() {
464 464
465 465 
     SWIFT_USER=$(keystone user-create --name=swift --pass="$SERVICE_PASSWORD" \
466 466 
         --tenant_id $SERVICE_TENANT --email=swift@example.com | grep " id " | get_field 2)
467 
-    keystone user-role-add --tenant_id $SERVICE_TENANT --user_id $SWIFT_USER --role_id $ADMIN_ROLE
467 
+    keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $SWIFT_USER --role-id $ADMIN_ROLE
468 468
469 469 
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
470 470 
         SWIFT_SERVICE=$(keystone service-create --name=swift --type="object-store" \
... ... 
@@ -479,14 +479,14 @@ function create_swift_accounts() {
479 479
480 480 
     SWIFT_TENANT_TEST1=$(keystone tenant-create --name=swifttenanttest1 | grep " id " | get_field 2)
481 481 
     SWIFT_USER_TEST1=$(keystone user-create --name=swiftusertest1 --pass=testing --email=test@example.com | grep " id " | get_field 2)
482 
-    keystone user-role-add --user_id $SWIFT_USER_TEST1 --role_id $ADMIN_ROLE --tenant_id $SWIFT_TENANT_TEST1
482 
+    keystone user-role-add --user-id $SWIFT_USER_TEST1 --role-id $ADMIN_ROLE --tenant-id $SWIFT_TENANT_TEST1
483 483
484 484 
     SWIFT_USER_TEST3=$(keystone user-create --name=swiftusertest3 --pass=testing3 --email=test3@example.com | grep " id " | get_field 2)
485 
-    keystone user-role-add --user_id $SWIFT_USER_TEST3 --role_id $ANOTHER_ROLE --tenant_id $SWIFT_TENANT_TEST1
485 
+    keystone user-role-add --user-id $SWIFT_USER_TEST3 --role-id $ANOTHER_ROLE --tenant-id $SWIFT_TENANT_TEST1
486 486
487 487 
     SWIFT_TENANT_TEST2=$(keystone tenant-create --name=swifttenanttest2 | grep " id " | get_field 2)
488 488 
     SWIFT_USER_TEST2=$(keystone user-create --name=swiftusertest2 --pass=testing2 --email=test2@example.com | grep " id " | get_field 2)
489 
-    keystone user-role-add --user_id $SWIFT_USER_TEST2 --role_id $ADMIN_ROLE --tenant_id $SWIFT_TENANT_TEST2
489 
+    keystone user-role-add --user-id $SWIFT_USER_TEST2 --role-id $ADMIN_ROLE --tenant-id $SWIFT_TENANT_TEST2
490 490 
 }
491 491
492 492 
 # init_swift() - Initialize rings