Always include network
There is a check in compute.rb for network_type, if 'nova' we include openstack-compute::network, however, network.rb is also where we load neutron plugins, and it also has a check for 'nova' or 'neutron', so it doesn't make sense to not include this with compute. Otherwise, if you assign this recipe to your compute node and have 'openstack.compute.network.service_type=neutron' you won't get your plugins (like openvswitch or nicira or whatnot) Change-Id: I587ca1db3c7c0635121096dc0bb54f7caa30c784
This commit is contained in:
parent
b2af5c0b84
commit
602192549e
@ -25,9 +25,7 @@ end
|
||||
|
||||
include_recipe 'openstack-compute::nova-common'
|
||||
include_recipe 'openstack-compute::api-metadata'
|
||||
if node['openstack']['compute']['network']['service_type'] == 'nova'
|
||||
include_recipe 'openstack-compute::network'
|
||||
end
|
||||
include_recipe 'openstack-compute::network'
|
||||
|
||||
platform_options = node['openstack']['compute']['platform']
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user