Merge "Create networks only when network service is enabled"
This commit is contained in:
commit
1f6749ebf3
@ -544,10 +544,13 @@ def config_tempest(**kwargs):
|
||||
False))
|
||||
image.create_tempest_images(conf)
|
||||
|
||||
# FIXME(chkumar246): Remove dead code of nova_network
|
||||
# as it is deprecated long time ago.
|
||||
has_neutron = services.is_service(**{"type": "network"})
|
||||
network = services.get_service("network")
|
||||
network.create_tempest_networks(has_neutron, conf,
|
||||
kwargs.get('network_id'))
|
||||
if has_neutron:
|
||||
network = services.get_service("network")
|
||||
network.create_tempest_networks(has_neutron, conf,
|
||||
kwargs.get('network_id'))
|
||||
|
||||
services.post_configuration()
|
||||
services.set_supported_api_versions()
|
||||
|
Loading…
x
Reference in New Issue
Block a user