@@ -398,6 +398,10 @@ function configure_tempest {

     # neutron.allow_duplicate_networks option was removed from nova in Liberty

     # and is now the default behavior.

     iniset $TEMPEST_CONFIG compute-feature-enabled allow_duplicate_networks ${NOVA_ALLOW_DUPLICATE_NETWORKS:-True}

+    if is_service_enabled n-cell; then

+        # Cells doesn't support shelving/unshelving

+        iniset $TEMPEST_CONFIG compute-feature-enabled shelve False

+    fi

     # Network

     iniset $TEMPEST_CONFIG network api_version 2.0