Browse code

Merge "Fix the logic of if used with is_service_enabled"

Jenkins authored on 2016/09/30 07:15:08
Showing 1 changed files
... ...
@@ -316,7 +316,7 @@ function configure_tempest {
316 316
     # set the equiv validation option here as well to ensure they are
317 317
     # in sync. They shouldn't be separate options.
318 318
     iniset $TEMPEST_CONFIG validation connect_method $ssh_connect_method
319
-    if [[ ! $(is_service_enabled n-cell) && ! $(is_service_enabled neutron) ]]; then
319
+    if ! is_service_enabled n-cell && ! is_service_enabled neutron; then
320 320
         iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
321 321
     fi
322 322