@@ -336,16 +336,23 @@ function configure_tempest {

     iniset $TEMPEST_CONFIG network-feature-enabled ipv6 "$IPV6_ENABLED"

     iniset $TEMPEST_CONFIG network-feature-enabled xml_api True

-    # boto

-    iniset $TEMPEST_CONFIG boto ec2_url "http://$SERVICE_HOST:8773/services/Cloud"

-    iniset $TEMPEST_CONFIG boto s3_url "http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}"

-    iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH"

-    iniset $TEMPEST_CONFIG boto ari_manifest cirros-0.3.1-x86_64-initrd.manifest.xml

-    iniset $TEMPEST_CONFIG boto ami_manifest cirros-0.3.1-x86_64-blank.img.manifest.xml

-    iniset $TEMPEST_CONFIG boto aki_manifest cirros-0.3.1-x86_64-vmlinuz.manifest.xml

-    iniset $TEMPEST_CONFIG boto instance_type "$boto_instance_type"

-    iniset $TEMPEST_CONFIG boto http_socket_timeout 30

-    iniset $TEMPEST_CONFIG boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}

+    # boto - disabled

+    #

+    # because of compat issues boto in icehouse is not testable

+    # against tempest. Set FORCE_BOTO=1 in local.conf to enable.

+    iniset $TEMPEST_CONFIG compute-feature-enabled ec2_api False

+    if [[ -n "$FORCE_BOTO" ]]; then

+        iniset $TEMPEST_CONFIG boto ec2_url "http://$SERVICE_HOST:8773/services/Cloud"

+        iniset $TEMPEST_CONFIG boto s3_url "http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}"

+        iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH"

+        iniset $TEMPEST_CONFIG boto ari_manifest cirros-0.3.1-x86_64-initrd.manifest.xml

+        iniset $TEMPEST_CONFIG boto ami_manifest cirros-0.3.1-x86_64-blank.img.manifest.xml

+        iniset $TEMPEST_CONFIG boto aki_manifest cirros-0.3.1-x86_64-vmlinuz.manifest.xml

+        iniset $TEMPEST_CONFIG boto instance_type "$boto_instance_type"

+        iniset $TEMPEST_CONFIG boto http_socket_timeout 30

+        iniset $TEMPEST_CONFIG boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}

+        iniset $TEMPEST_CONFIG compute-feature-enabled ec2_api True

+    fi

     # Orchestration Tests

     if is_service_enabled heat; then