Ironic on Devstack does not currently suppport security groups or
anything volume related. Add some special casing so exercises can
be run without error against the Ironic driver.
Change-Id: I2a54d8cca06fc17894e74b4401af9423cef95635
... | ... |
@@ -44,6 +44,9 @@ source $TOP_DIR/exerciserc |
44 | 44 |
# the exercise is skipped |
45 | 45 |
is_service_enabled cinder || exit 55 |
46 | 46 |
|
47 |
+# Ironic does not support boot from volume. |
|
48 |
+[ "$VIRT_DRIVER" == "ironic" ] && exit 55 |
|
49 |
+ |
|
47 | 50 |
# Instance type to create |
48 | 51 |
DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.tiny} |
49 | 52 |
|
... | ... |
@@ -36,6 +36,9 @@ source $TOP_DIR/eucarc |
36 | 36 |
# Import exercise configuration |
37 | 37 |
source $TOP_DIR/exerciserc |
38 | 38 |
|
39 |
+# Import project functions |
|
40 |
+source $TOP_DIR/lib/neutron |
|
41 |
+ |
|
39 | 42 |
# If nova api is not enabled we exit with exitcode 55 so that |
40 | 43 |
# the exercise is skipped |
41 | 44 |
is_service_enabled n-api || exit 55 |
... | ... |
@@ -82,7 +85,7 @@ fi |
82 | 82 |
|
83 | 83 |
# Volumes |
84 | 84 |
# ------- |
85 |
-if is_service_enabled c-vol && ! is_service_enabled n-cell; then |
|
85 |
+if is_service_enabled c-vol && ! is_service_enabled n-cell && [ "$VIRT_DRIVER" != "ironic" ]; then |
|
86 | 86 |
VOLUME_ZONE=`euca-describe-availability-zones | head -n1 | cut -f2` |
87 | 87 |
die_if_not_set $LINENO VOLUME_ZONE "Failure to find zone for volume" |
88 | 88 |
|
... | ... |
@@ -180,7 +180,7 @@ if ! timeout $ASSOCIATE_TIMEOUT sh -c "while nova secgroup-list-rules $SECGROUP |
180 | 180 |
fi |
181 | 181 |
|
182 | 182 |
# FIXME (anthony): make xs support security groups |
183 |
-if [ "$VIRT_DRIVER" != "xenserver" -a "$VIRT_DRIVER" != "openvz" ]; then |
|
183 |
+if [ "$VIRT_DRIVER" != "ironic" -a "$VIRT_DRIVER" != "xenserver" -a "$VIRT_DRIVER" != "openvz" ]; then |
|
184 | 184 |
# Test we can aren't able to ping our floating ip within ASSOCIATE_TIMEOUT seconds |
185 | 185 |
ping_check "$PUBLIC_NETWORK_NAME" $FLOATING_IP $ASSOCIATE_TIMEOUT Fail |
186 | 186 |
fi |
... | ... |
@@ -41,6 +41,9 @@ source $TOP_DIR/exerciserc |
41 | 41 |
# exercise is skipped. |
42 | 42 |
is_service_enabled cinder || exit 55 |
43 | 43 |
|
44 |
+# Ironic does not currently support volume attachment. |
|
45 |
+[ "$VIRT_DRIVER" == "ironic" ] && exit 55 |
|
46 |
+ |
|
44 | 47 |
# Instance type to create |
45 | 48 |
DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.tiny} |
46 | 49 |
|