Browse code

Merge "Don't set tempest fixed_network_name with neutron"

Jenkins authored on 2015/05/18 11:34:04
Showing 1 changed files
... ...
@@ -344,7 +344,7 @@ function configure_tempest {
344 344
     iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref
345 345
     iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt
346 346
     iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method
347
-    if ! is_service_enabled n-cell; then
347
+    if [[ ! $(is_service_enabled n-cell) && ! $(is_service_enabled neutron) ]]; then
348 348
         iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
349 349
     fi
350 350