Skip to content

Commit ce05e03

Browse files
author
Adam Gandelman
committed
exercises: Multihost support for Glance client
floating_ips and volumes exercises both access Glance directly, but assume it is running locally. To better accomodate exercising a multi-host cloud, specify glance host via GLANCE_HOST setting which defaults to HOST_IP to maintain current single-node functionality. Change-Id: Iad06044af031083afa477204d446ada5161ca521
1 parent d2be50c commit ce05e03

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
Adam Gandelman <[email protected]>
12
Andy Smith <[email protected]>
23
Anthony Young <[email protected]>
34
Brad Hall <[email protected]>

‎exercises/floating_ips.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ nova list
7070
nova image-list
7171

7272
# But we recommend using glance directly
73-
glance -f -A $TOKEN index
73+
glance -f -A $TOKEN -H $GLANCE_HOST index
7474

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

7878
# Security Groups
7979
# ---------------

‎exercises/volumes.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ nova list
5656
nova image-list
5757

5858
# But we recommend using glance directly
59-
glance -f -A $TOKEN index
59+
glance -f -A $TOKEN -H $GLANCE_HOST index
6060

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

6464
# determinine instance type
6565
# -------------------------

‎openrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ source ./stackrc
88
HOST_IP=${HOST_IP:-127.0.0.1}
99
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
1010

11+
# Some exercises call glance directly. On a single-node installation, Glance
12+
# should be listening on HOST_IP. If its running elsewhere, it can be set here
13+
GLANCE_HOST=${GLANCE_HOST:-$HOST_IP}
14+
1115
# Nova original used project_id as the *account* that owned resources (servers,
1216
# ip address, ...) With the addition of Keystone we have standardized on the
1317
# term **tenant** as the entity that owns the resources. **novaclient** still

0 commit comments

Comments
 (0)