commit 526b79f98825963c5fbb157bca5a54750bd045af
author Dean Troyer <dtroyer@gmail.com> Fri Nov 22 11:30:44 2013 -0600
committer Dean Troyer <dtroyer@gmail.com> Thu Dec 05 12:25:26 2013 -0600
tree 755fb1bd056253d08300d38f8b961b3cd1795366
parent 3422668612f667ef3b8b04999562e0206dd07424

Eradicate last of underscores in options

The --ip_range in stack.sh remains due to nova-manage needing to be fixed.

(Rebased 05Dec2013)

Change-Id: Ic0f93d41b6edfdc5deb82ae820e2c0c5a8bce24e

stack.sh

diff --git a/stack.sh b/stack.sh
index af01faa..22d184e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1083,7 +1083,7 @@
     die_if_not_set $LINENO NOVA_USER_ID "Failure retrieving NOVA_USER_ID for nova"
     NOVA_TENANT_ID=$(keystone tenant-list | grep " $SERVICE_TENANT_NAME " | get_field 1)
     die_if_not_set $LINENO NOVA_TENANT_ID "Failure retrieving NOVA_TENANT_ID for $SERVICE_TENANT_NAME"
-    CREDS=$(keystone ec2-credentials-create --user_id $NOVA_USER_ID --tenant_id $NOVA_TENANT_ID)
+    CREDS=$(keystone ec2-credentials-create --user-id $NOVA_USER_ID --tenant-id $NOVA_TENANT_ID)
     ACCESS_KEY=$(echo "$CREDS" | awk '/ access / { print $4 }')
     SECRET_KEY=$(echo "$CREDS" | awk '/ secret / { print $4 }')
     iniset $NOVA_CONF DEFAULT s3_access_key "$ACCESS_KEY"