commit c9e842871b850da24a57e2ba5c98020c529111b2
author Jenkins <jenkins@review.openstack.org> Mon May 18 02:34:04 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon May 18 02:34:04 2015 +0000
tree fe89bbe9d4e0bc97019215dc4aead6928b39776b
parent db7809880bcee2bd56ccb5d74fec2ba435d7b2ea
parent 4b684aed316a89d4bc0d365e594ed345fe99d6b4

Merge "Don't set tempest fixed_network_name with neutron"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 9c22716..f02b0d1 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -344,7 +344,7 @@
     iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref
     iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt
     iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method
-    if ! is_service_enabled n-cell; then
+    if [[ ! $(is_service_enabled n-cell) && ! $(is_service_enabled neutron) ]]; then
         iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
     fi