Skip to content

Commit 31cce21

Browse files
Dean Troyervishvananda
Dean Troyer
authored and
vishvananda
committed
Blueprint cli-auth
* Add proper test for swift in client-env.sh * Remove all VERIFY variables; nothing beyond the 4 OS_ vars is set now * Update exercises for Keystone 2.0 auth * swift understands Keystone 2.0 auth now, don't download custom binary * cleanup uploaded bundle in bundle.sh Change-Id: I99c818d81534bbf93c0e142513acb80e5fe613ea
1 parent 00596bb commit 31cce21

5 files changed

Lines changed: 18 additions & 63 deletions

File tree

‎exercises/bundle.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ if ! timeout $REGISTER_TIMEOUT sh -c "while euca-describe-images | grep '$AMI' |
4646
echo "Image $AMI not available within $REGISTER_TIMEOUT seconds"
4747
exit 1
4848
fi
49+
50+
# Clean up
51+
euca-deregister $AMI

‎exercises/client-env.sh‎

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,13 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
5252
if [[ "$SKIP_EXERCISES" =~ "key" ]] ; then
5353
STATUS_KEYSTONE="Skipped"
5454
else
55-
if [[ -n "$VERIFY" ]]; then
56-
# Save original environment
57-
xOS_AUTH_URL=$OS_AUTH_URL
58-
xOS_TENANT_NAME=$OS_TENANT_NAME
59-
xOS_USERNAME=$OS_USERNAME
60-
xOS_PASSWORD=$OS_PASSWORD
61-
# keystone can't handle a trailing '/'
62-
export OS_AUTH_URL=${OS_AUTH_URL%/}
63-
# does any non-admin request work?
64-
export OS_USERNAME=admin
65-
export OS_TENANT_NAME=admin
66-
fi
55+
# We need to run the keystone test as admin since there doesn't
56+
# seem to be anything to test the cli vars that runs as a user
57+
# tenant-list should do that, it isn't implemented (yet)
58+
xOS_TENANT_NAME=$OS_TENANT_NAME
59+
xOS_USERNAME=$OS_USERNAME
60+
export OS_USERNAME=admin
61+
export OS_TENANT_NAME=admin
6762

6863
echo -e "\nTest Keystone"
6964
if keystone service-list; then
@@ -72,13 +67,9 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
7267
STATUS_KEYSTONE="Failed"
7368
RETURN=1
7469
fi
75-
if [[ -n "$VERIFY" ]]; then
76-
# Save original environment
77-
OS_AUTH_URL=$xOS_AUTH_URL
78-
OS_TENANT_NAME=$xOS_TENANT_NAME
79-
OS_USERNAME=$xOS_USERNAME
80-
OS_PASSWORD=$xOS_PASSWORD
81-
fi
70+
71+
OS_TENANT_NAME=$xOS_TENANT_NAME
72+
OS_USERNAME=$xOS_USERNAME
8273
fi
8374
fi
8475

@@ -89,12 +80,6 @@ if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
8980
if [[ "$SKIP_EXERCISES" =~ "n-api" ]] ; then
9081
STATUS_NOVA="Skipped"
9182
else
92-
if [[ -n "$VERIFY" ]]; then
93-
# Known novaclient breakage:
94-
# NOVA_VERSION must be set or nova silently fails
95-
export NOVA_VERSION=2
96-
fi
97-
9883
echo -e "\nTest Nova"
9984
if nova flavor-list; then
10085
STATUS_NOVA="Succeeded"
@@ -112,14 +97,6 @@ if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
11297
if [[ "$SKIP_EXERCISES" =~ "g-api" ]] ; then
11398
STATUS_GLANCE="Skipped"
11499
else
115-
if [[ -n "$VERIFY" ]]; then
116-
# Known glance client differage:
117-
export OS_AUTH_TENANT=$OS_TENANT_NAME
118-
export OS_AUTH_USER=$OS_USERNAME
119-
export OS_AUTH_KEY=$OS_PASSWORD
120-
export OS_AUTH_STRATEGY=keystone
121-
fi
122-
123100
echo -e "\nTest Glance"
124101
if glance index; then
125102
STATUS_GLANCE="Succeeded"
@@ -138,8 +115,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
138115
STATUS_SWIFT="Skipped"
139116
else
140117
echo -e "\nTest Swift"
141-
# FIXME(dtroyer): implement swift test
142-
if true; then
118+
if swift stat; then
143119
STATUS_SWIFT="Succeeded"
144120
else
145121
STATUS_SWIFT="Failed"

‎exercises/floating_ips.sh‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,6 @@ DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-nova}
4848
# Additional floating IP pool and range
4949
TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test}
5050

51-
# Get a token for clients that don't support service catalog
52-
# ==========================================================
53-
54-
# manually create a token by querying keystone (sending JSON data). Keystone
55-
# returns a token and catalog of endpoints. We use python to parse the token
56-
# and save it.
57-
58-
TOKEN=`curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\": \"$OS_USERNAME\", \"password\": \"$OS_PASSWORD\"}}}" -H "Content-type: application/json" ${OS_AUTH_URL%/}/tokens | python -c "import sys; import json; tok = json.loads(sys.stdin.read()); print tok['access']['token']['id'];"`
59-
6051
# Launching a server
6152
# ==================
6253

@@ -70,10 +61,10 @@ nova list
7061
nova image-list
7162

7263
# But we recommend using glance directly
73-
glance -f -A $TOKEN -H $GLANCE_HOST index
64+
glance -f index
7465

7566
# Grab the id of the image to launch
76-
IMAGE=`glance -f -A $TOKEN -H $GLANCE_HOST index | egrep $DEFAULT_IMAGE_NAME | head -1 | cut -d" " -f1`
67+
IMAGE=`glance -f index | egrep $DEFAULT_IMAGE_NAME | head -1 | cut -d" " -f1`
7768

7869
# Security Groups
7970
# ---------------

‎exercises/volumes.sh‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@ DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.tiny}
3434
# Boot this image, use first AMi image if unset
3535
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami}
3636

37-
# Get a token for clients that don't support service catalog
38-
# ==========================================================
39-
40-
# manually create a token by querying keystone (sending JSON data). Keystone
41-
# returns a token and catalog of endpoints. We use python to parse the token
42-
# and save it.
43-
44-
TOKEN=`curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\": \"$OS_USERNAME\", \"password\": \"$OS_PASSWORD\"}}}" -H "Content-type: application/json" ${OS_AUTH_URL%/}/tokens | python -c "import sys; import json; tok = json.loads(sys.stdin.read()); print tok['access']['token']['id'];"`
45-
4637
# Launching a server
4738
# ==================
4839

@@ -56,10 +47,10 @@ nova list
5647
nova image-list
5748

5849
# But we recommend using glance directly
59-
glance -f -A $TOKEN -H $GLANCE_HOST index
50+
glance -f index
6051

6152
# Grab the id of the image to launch
62-
IMAGE=`glance -f -A $TOKEN -H $GLANCE_HOST index | egrep $DEFAULT_IMAGE_NAME | head -1 | cut -d" " -f1`
53+
IMAGE=`glance -f index | egrep $DEFAULT_IMAGE_NAME | head -1 | cut -d" " -f1`
6354

6455
# determinine instance type
6556
# -------------------------

‎stack.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -981,12 +981,6 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
981981
# We install the memcache server as this is will be used by the
982982
# middleware to cache the tokens auths for a long this is needed.
983983
apt_get install memcached
984-
985-
# We need a special version of bin/swift which understand the
986-
# OpenStack api 2.0, we download it until this is getting
987-
# integrated in swift.
988-
sudo https_proxy=$https_proxy curl -s -o/usr/local/bin/swift \
989-
'https://review.openstack.org/gitweb?p=openstack/swift.git;a=blob_plain;f=bin/swift;hb=48bfda6e2fdf3886c98bd15649887d54b9a2574e'
990984
else
991985
swift_auth_server=tempauth
992986
fi

0 commit comments

Comments
 (0)