@@ -147,3 +147,9 @@ nova secgroup-delete $SECGROUP

 # FIXME: validate shutdown within 5 seconds

 # (nova show $NAME returns 1 or status != ACTIVE)?

+

+# Testing Euca2ools

+# ==================

+

+# make sure that we can describe instances

+euca-describe-instances

@@ -16,3 +16,4 @@ iputils-ping

 wget

 curl

 tcpdump

+euca2ools # only for testing client

@@ -36,8 +36,8 @@ $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%HOS

 # Tokens

 $BIN_DIR/keystone-manage $* token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00

-# EC2 related creds - note we are setting the token to user_password

+# EC2 related creds - note we are setting the secret key to ADMIN_PASSWORD

 # but keystone doesn't parse them - it is just a blob from keystone's

 # point of view

-$BIN_DIR/keystone-manage $* credentials add admin EC2 'admin_%ADMIN_PASSWORD%' admin admin || echo "no support for adding credentials"

-$BIN_DIR/keystone-manage $* credentials add demo EC2 'demo_%ADMIN_PASSWORD%' demo demo || echo "no support for adding credentials"

+$BIN_DIR/keystone-manage $* credentials add admin EC2 'admin' '%ADMIN_PASSWORD%' admin || echo "no support for adding credentials"

+$BIN_DIR/keystone-manage $* credentials add demo EC2 'demo' '%ADMIN_PASSWORD%' demo || echo "no support for adding credentials"

@@ -26,7 +26,7 @@ export NOVA_API_KEY=${ADMIN_PASSWORD:-secrete}

 # has access to - including nova, glance, keystone, swift, ...  We currently

 # recommend using the 2.0 *auth api*.

 #

-# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We 

+# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0.  We

 # will use the 1.1 *compute api*

 export NOVA_URL=${NOVA_URL:-http://$HOST_IP:5000/v2.0/}

@@ -37,5 +37,15 @@ export NOVA_VERSION=${NOVA_VERSION:-1.1}

 # FIXME - why does this need to be specified?

 export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}

+# Set the ec2 url so euca2ools works

+export EC2_URL=${EC2_URL:-http://$HOST_IP:8773/services/Cloud}

+

+# Access key is set in the initial keystone data to be the same as username

+export EC2_ACCESS_KEY=${USERNAME:-demo}

+

+# Secret key is set in the initial keystone data to the admin password

+export EC2_SECRET_KEY=${ADMIN_PASSWORD:-secrete}

+

 # set log level to DEBUG (helps debug issues)

 # export NOVACLIENT_DEBUG=1

+