openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove use_neutron option"

Browse Source
This commit is contained in:
Jenkins
2017-03-10 18:34:31 +00:00
committed by Gerrit Code Review
parent 1ca91dbd4c 14b9405740
commit a6050f4b56
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/network/neutron.pp
View File

@@ -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;

1
spec/classes/nova_network_neutron_spec.rb
View File

@@ -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])