Merge "Fix the logic of if used with is_service_enabled"

This commit is contained in:
Jenkins 2016-09-29 22:15:08 +00:00 committed by Gerrit Code Review
commit e43cca1adf

View File

@ -316,7 +316,7 @@ function configure_tempest {
# set the equiv validation option here as well to ensure they are
# in sync. They shouldn't be separate options.
iniset $TEMPEST_CONFIG validation connect_method $ssh_connect_method
if [[ ! $(is_service_enabled n-cell) && ! $(is_service_enabled neutron) ]]; then
if ! is_service_enabled n-cell && ! is_service_enabled neutron; then
iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
fi