commit 19685428e3d3e51ff88aa5254f7c27d476053798
author Steve Martinelli <stevemar@ca.ibm.com> Fri Jan 24 13:02:26 2014 -0600
committer Steve Martinelli <stevemar@ca.ibm.com> Fri Feb 14 21:30:57 2014 -0600
tree dac1d9632b47c4e9fbc176a9ea92d92e4db27e10
parent 824fac2cc740fa83086ac65ff8a5657eafbc1166

Change most keystoneclient commands to openstacklient in libs

migrated most keystoneclient commands from the following libs:
 ceilometer
 cinder
 ironic
 keystone
 marconi
 neutron
 nova
 savanna
 swift
 trove

Also need to set and unset openstackclient specific environment
variables from stack.sh

Change-Id: I725f30bc08e1df5a4c5770576c19ad1ddaeb843a

stack.sh

diff --git a/stack.sh b/stack.sh
index c153132..e5d87cc 100755
--- a/stack.sh
+++ b/stack.sh
@@ -925,6 +925,9 @@
     # Do the keystone-specific bits from keystone_data.sh
     export OS_SERVICE_TOKEN=$SERVICE_TOKEN
     export OS_SERVICE_ENDPOINT=$SERVICE_ENDPOINT
+    # Add temporarily to make openstackclient work
+    export OS_TOKEN=$SERVICE_TOKEN
+    export OS_URL=$SERVICE_ENDPOINT
     create_keystone_accounts
     create_nova_accounts
     create_cinder_accounts
@@ -947,6 +950,7 @@
         bash -x $FILES/keystone_data.sh
 
     # Set up auth creds now that keystone is bootstrapped
+    unset OS_TOKEN OS_URL
     export OS_AUTH_URL=$SERVICE_ENDPOINT
     export OS_TENANT_NAME=admin
     export OS_USERNAME=admin