Browse code
Don't set tempest fixed_network_name with neutron
If neutron is enabled then there isn't a shared private network
between all tenants which is what is required for the
fixed_network_name config option. This commit adds a conditional
to not set that option when neutron is enabled. While not necessarily
fatal to tempest it does emit a warning on almost every server create
call if it is set with a non-existent network name.
Change-Id: I1a42fa6b0b5a93b411c08ec35df043d6ea69d453
Matthew Treinish authored on 2015/05/16 01:38:09Showing 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 |
|