Update [neutron] section in nova.conf for Juno
Use new parameters for Juno like it's documented here: http://docs.openstack.org/trunk/config-reference/content/nova-conf-changes-master.html * Use [neutron] section * Delete the neutron_prefix when needed Closes-bug #1391099 Change-Id: Ib63a80ea28b5aa5c033df3ec503031a99f4824c9
This commit is contained in:
@@ -209,14 +209,14 @@ class nova::api(
|
||||
|
||||
if ($neutron_metadata_proxy_shared_secret){
|
||||
nova_config {
|
||||
'DEFAULT/service_neutron_metadata_proxy': value => true;
|
||||
'DEFAULT/neutron_metadata_proxy_shared_secret':
|
||||
'neutron/service_metadata_proxy': value => true;
|
||||
'neutron/metadata_proxy_shared_secret':
|
||||
value => $neutron_metadata_proxy_shared_secret;
|
||||
}
|
||||
} else {
|
||||
nova_config {
|
||||
'DEFAULT/service_neutron_metadata_proxy': value => false;
|
||||
'DEFAULT/neutron_metadata_proxy_shared_secret': ensure => absent;
|
||||
'neutron/service_metadata_proxy': value => false;
|
||||
'neutron/metadata_proxy_shared_secret': ensure => absent;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -107,29 +107,29 @@ class nova::network::neutron (
|
||||
) {
|
||||
|
||||
nova_config {
|
||||
'DEFAULT/neutron_auth_strategy': value => $neutron_auth_strategy;
|
||||
'DEFAULT/network_api_class': value => 'nova.network.neutronv2.api.API';
|
||||
'DEFAULT/neutron_url': value => $neutron_url;
|
||||
'DEFAULT/neutron_url_timeout': value => $neutron_url_timeout;
|
||||
'DEFAULT/neutron_admin_tenant_name': value => $neutron_admin_tenant_name;
|
||||
'DEFAULT/neutron_default_tenant_id': value => $neutron_default_tenant_id;
|
||||
'DEFAULT/neutron_region_name': value => $neutron_region_name;
|
||||
'DEFAULT/neutron_admin_username': value => $neutron_admin_username;
|
||||
'DEFAULT/neutron_admin_password': value => $neutron_admin_password, secret => true;
|
||||
'DEFAULT/neutron_admin_auth_url': value => $neutron_admin_auth_url;
|
||||
'DEFAULT/neutron_ovs_bridge': value => $neutron_ovs_bridge;
|
||||
'DEFAULT/neutron_extension_sync_interval': value => $neutron_extension_sync_interval;
|
||||
'DEFAULT/security_group_api': value => $security_group_api;
|
||||
'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/dhcp_domain': value => $dhcp_domain;
|
||||
'DEFAULT/dhcp_domain': value => $dhcp_domain;
|
||||
'DEFAULT/firewall_driver': value => $firewall_driver;
|
||||
'DEFAULT/network_api_class': value => 'nova.network.neutronv2.api.API';
|
||||
'DEFAULT/security_group_api': value => $security_group_api;
|
||||
'DEFAULT/vif_plugging_is_fatal': value => $vif_plugging_is_fatal;
|
||||
'DEFAULT/vif_plugging_timeout': value => $vif_plugging_timeout;
|
||||
'neutron/auth_strategy': value => $neutron_auth_strategy;
|
||||
'neutron/url': value => $neutron_url;
|
||||
'neutron/url_timeout': value => $neutron_url_timeout;
|
||||
'neutron/admin_tenant_name': value => $neutron_admin_tenant_name;
|
||||
'neutron/default_tenant_id': value => $neutron_default_tenant_id;
|
||||
'neutron/region_name': value => $neutron_region_name;
|
||||
'neutron/admin_username': value => $neutron_admin_username;
|
||||
'neutron/admin_password': value => $neutron_admin_password, secret => true;
|
||||
'neutron/admin_auth_url': value => $neutron_admin_auth_url;
|
||||
'neutron/ovs_bridge': value => $neutron_ovs_bridge;
|
||||
'neutron/extension_sync_interval': value => $neutron_extension_sync_interval;
|
||||
}
|
||||
|
||||
if ! $neutron_ca_certificates_file {
|
||||
nova_config { 'DEFAULT/neutron_ca_certificates_file': ensure => absent }
|
||||
nova_config { 'neutron/ca_certificates_file': ensure => absent }
|
||||
} else {
|
||||
nova_config { 'DEFAULT/neutron_ca_certificates_file': value => $neutron_ca_certificates_file }
|
||||
nova_config { 'neutron/ca_certificates_file': value => $neutron_ca_certificates_file }
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -68,8 +68,8 @@ describe 'nova::api' do
|
||||
end
|
||||
|
||||
it 'unconfigures neutron_metadata proxy' do
|
||||
should contain_nova_config('DEFAULT/service_neutron_metadata_proxy').with(:value => false)
|
||||
should contain_nova_config('DEFAULT/neutron_metadata_proxy_shared_secret').with(:ensure => 'absent')
|
||||
should contain_nova_config('neutron/service_metadata_proxy').with(:value => false)
|
||||
should contain_nova_config('neutron/metadata_proxy_shared_secret').with(:ensure => 'absent')
|
||||
end
|
||||
end
|
||||
|
||||
@@ -155,8 +155,8 @@ describe 'nova::api' do
|
||||
should contain_nova_config('DEFAULT/use_forwarded_for').with('value' => false)
|
||||
should contain_nova_config('DEFAULT/osapi_compute_workers').with('value' => '1')
|
||||
should contain_nova_config('DEFAULT/metadata_workers').with('value' => '2')
|
||||
should contain_nova_config('DEFAULT/service_neutron_metadata_proxy').with('value' => true)
|
||||
should contain_nova_config('DEFAULT/neutron_metadata_proxy_shared_secret').with('value' => 'secrete')
|
||||
should contain_nova_config('neutron/service_metadata_proxy').with('value' => true)
|
||||
should contain_nova_config('neutron/metadata_proxy_shared_secret').with('value' => 'secrete')
|
||||
should contain_nova_config('DEFAULT/keystone_ec2_url').with('value' => 'https://example.com:5000/v2.0/ec2tokens')
|
||||
end
|
||||
|
||||
|
@@ -28,23 +28,23 @@ describe 'nova::network::neutron' do
|
||||
|
||||
context 'with required parameters' do
|
||||
it 'configures neutron endpoint in nova.conf' do
|
||||
should contain_nova_config('DEFAULT/neutron_admin_password').with_value(params[:neutron_admin_password]).with_secret(true)
|
||||
should contain_nova_config('neutron/admin_password').with_value(params[:neutron_admin_password]).with_secret(true)
|
||||
should contain_nova_config('DEFAULT/network_api_class').with_value('nova.network.neutronv2.api.API')
|
||||
should contain_nova_config('DEFAULT/neutron_auth_strategy').with_value(default_params[:neutron_auth_strategy])
|
||||
should contain_nova_config('DEFAULT/neutron_url').with_value(default_params[:neutron_url])
|
||||
should contain_nova_config('DEFAULT/neutron_url_timeout').with_value(default_params[:neutron_url_timeout])
|
||||
should contain_nova_config('DEFAULT/neutron_admin_tenant_name').with_value(default_params[:neutron_admin_tenant_name])
|
||||
should contain_nova_config('DEFAULT/neutron_default_tenant_id').with_value(default_params[:neutron_default_tenant_id])
|
||||
should contain_nova_config('DEFAULT/neutron_region_name').with_value(default_params[:neutron_region_name])
|
||||
should contain_nova_config('DEFAULT/neutron_admin_username').with_value(default_params[:neutron_admin_username])
|
||||
should contain_nova_config('DEFAULT/neutron_admin_auth_url').with_value(default_params[:neutron_admin_auth_url])
|
||||
should contain_nova_config('DEFAULT/neutron_extension_sync_interval').with_value(default_params[:neutron_extension_sync_interval])
|
||||
should contain_nova_config('DEFAULT/dhcp_domain').with_value(default_params[:dhcp_domain])
|
||||
should contain_nova_config('neutron/auth_strategy').with_value(default_params[:neutron_auth_strategy])
|
||||
should contain_nova_config('neutron/url').with_value(default_params[:neutron_url])
|
||||
should contain_nova_config('neutron/url_timeout').with_value(default_params[:neutron_url_timeout])
|
||||
should contain_nova_config('neutron/admin_tenant_name').with_value(default_params[:neutron_admin_tenant_name])
|
||||
should contain_nova_config('neutron/default_tenant_id').with_value(default_params[:neutron_default_tenant_id])
|
||||
should contain_nova_config('neutron/region_name').with_value(default_params[:neutron_region_name])
|
||||
should contain_nova_config('neutron/admin_username').with_value(default_params[:neutron_admin_username])
|
||||
should contain_nova_config('neutron/admin_auth_url').with_value(default_params[:neutron_admin_auth_url])
|
||||
should contain_nova_config('neutron/extension_sync_interval').with_value(default_params[:neutron_extension_sync_interval])
|
||||
end
|
||||
it 'configures Nova to use Neutron Bridge Security Groups and Firewall' do
|
||||
should contain_nova_config('DEFAULT/firewall_driver').with_value(default_params[:firewall_driver])
|
||||
should contain_nova_config('DEFAULT/security_group_api').with_value(default_params[:security_group_api])
|
||||
should contain_nova_config('DEFAULT/neutron_ovs_bridge').with_value(default_params[:neutron_ovs_bridge])
|
||||
should contain_nova_config('neutron/ovs_bridge').with_value(default_params[:neutron_ovs_bridge])
|
||||
end
|
||||
it 'configures neutron vif plugging events in nova.conf' do
|
||||
should contain_nova_config('DEFAULT/vif_plugging_is_fatal').with_value(default_params[:vif_plugging_is_fatal])
|
||||
@@ -73,23 +73,23 @@ describe 'nova::network::neutron' do
|
||||
end
|
||||
|
||||
it 'configures neutron endpoint in nova.conf' do
|
||||
should contain_nova_config('DEFAULT/neutron_auth_strategy').with_value(default_params[:neutron_auth_strategy])
|
||||
should contain_nova_config('DEFAULT/neutron_admin_password').with_value(params[:neutron_admin_password]).with_secret(true)
|
||||
should contain_nova_config('neutron/auth_strategy').with_value(default_params[:neutron_auth_strategy])
|
||||
should contain_nova_config('neutron/admin_password').with_value(params[:neutron_admin_password]).with_secret(true)
|
||||
should contain_nova_config('DEFAULT/network_api_class').with_value('nova.network.neutronv2.api.API')
|
||||
should contain_nova_config('DEFAULT/neutron_url').with_value(params[:neutron_url])
|
||||
should contain_nova_config('DEFAULT/neutron_url_timeout').with_value(params[:neutron_url_timeout])
|
||||
should contain_nova_config('DEFAULT/neutron_admin_tenant_name').with_value(params[:neutron_admin_tenant_name])
|
||||
should contain_nova_config('DEFAULT/neutron_default_tenant_id').with_value(params[:neutron_default_tenant_id])
|
||||
should contain_nova_config('DEFAULT/neutron_region_name').with_value(params[:neutron_region_name])
|
||||
should contain_nova_config('DEFAULT/neutron_admin_username').with_value(params[:neutron_admin_username])
|
||||
should contain_nova_config('DEFAULT/neutron_admin_auth_url').with_value(params[:neutron_admin_auth_url])
|
||||
should contain_nova_config('DEFAULT/neutron_extension_sync_interval').with_value(params[:neutron_extension_sync_interval])
|
||||
should contain_nova_config('DEFAULT/dhcp_domain').with_value(params[:dhcp_domain])
|
||||
should contain_nova_config('neutron/url').with_value(params[:neutron_url])
|
||||
should contain_nova_config('neutron/url_timeout').with_value(params[:neutron_url_timeout])
|
||||
should contain_nova_config('neutron/admin_tenant_name').with_value(params[:neutron_admin_tenant_name])
|
||||
should contain_nova_config('neutron/default_tenant_id').with_value(params[:neutron_default_tenant_id])
|
||||
should contain_nova_config('neutron/region_name').with_value(params[:neutron_region_name])
|
||||
should contain_nova_config('neutron/admin_username').with_value(params[:neutron_admin_username])
|
||||
should contain_nova_config('neutron/admin_auth_url').with_value(params[:neutron_admin_auth_url])
|
||||
should contain_nova_config('neutron/extension_sync_interval').with_value(params[:neutron_extension_sync_interval])
|
||||
end
|
||||
it 'configures Nova to use Neutron Security Groups and Firewall' do
|
||||
should contain_nova_config('DEFAULT/firewall_driver').with_value(params[:firewall_driver])
|
||||
should contain_nova_config('DEFAULT/security_group_api').with_value(params[:security_group_api])
|
||||
should contain_nova_config('DEFAULT/neutron_ovs_bridge').with_value(params[:neutron_ovs_bridge])
|
||||
should contain_nova_config('neutron/ovs_bridge').with_value(params[:neutron_ovs_bridge])
|
||||
end
|
||||
it 'configures neutron vif plugging events in nova.conf' do
|
||||
should contain_nova_config('DEFAULT/vif_plugging_is_fatal').with_value(params[:vif_plugging_is_fatal])
|
||||
|
Reference in New Issue
Block a user