diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index c161e155b..f81d86429 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -215,7 +215,6 @@ class nova::network::neutron ( 'DEFAULT/firewall_driver': value => $firewall_driver; 'DEFAULT/vif_plugging_is_fatal': value => $vif_plugging_is_fatal; 'DEFAULT/vif_plugging_timeout': value => $vif_plugging_timeout; - 'DEFAULT/use_neutron': value => true; 'neutron/url': value => $neutron_url; 'neutron/timeout': value => $neutron_url_timeout; 'neutron/project_name': value => $neutron_project_name_real; diff --git a/spec/classes/nova_network_neutron_spec.rb b/spec/classes/nova_network_neutron_spec.rb index 5a7dec33c..3f27e66db 100644 --- a/spec/classes/nova_network_neutron_spec.rb +++ b/spec/classes/nova_network_neutron_spec.rb @@ -29,7 +29,6 @@ describe 'nova::network::neutron' do it 'configures neutron endpoint in nova.conf' do is_expected.to contain_nova_config('neutron/password').with_value(params[:neutron_password]).with_secret(true) is_expected.to contain_nova_config('DEFAULT/dhcp_domain').with_value(default_params[:dhcp_domain]) - is_expected.to contain_nova_config('DEFAULT/use_neutron').with_value(true) is_expected.to contain_nova_config('neutron/auth_type').with_value(default_params[:neutron_auth_type]) is_expected.to contain_nova_config('neutron/url').with_value(default_params[:neutron_url]) is_expected.to contain_nova_config('neutron/timeout').with_value(default_params[:neutron_url_timeout])