Fix nova deprecated parameters

Upstream patch https://review.openstack.org/447533 removes
deprecated parameters from puppet-nova, so we need update
them in fuel-library

Change-Id: I1c5c2d86e5ac100c2635cae8ee3506d8719d56f9
Closes-Bug: #1674375
This commit is contained in:
Mykyta Karpin 2017-03-20 17:51:00 +02:00
parent ccdcbae82a
commit c25dbe9248
2 changed files with 15 additions and 4 deletions

View File

@ -112,6 +112,11 @@ class openstack_tasks::ironic::ironic_compute {
os_region_name => $region_name,
}
class { '::nova::availability_zone':
default_availability_zone => $nova_hash['default_availability_zone'],
default_schedule_zone => $nova_hash['default_schedule_zone'],
}
class { '::nova::compute':
ensure_package => installed,
enabled => false,
@ -119,10 +124,7 @@ class openstack_tasks::ironic::ironic_compute {
force_config_drive => $nova_hash['force_config_drive'],
#NOTE(bogdando) default became true in 4.0.0 puppet-nova (was false)
neutron_enabled => true,
default_availability_zone => $nova_hash['default_availability_zone'],
default_schedule_zone => $nova_hash['default_schedule_zone'],
reserved_host_memory => '0',
compute_manager => 'ironic.nova.compute.manager.ClusteredComputeManager',
allow_resize_to_same_host => pick($nova_hash['allow_resize_to_same_host'], true)
}

View File

@ -64,7 +64,6 @@ describe manifest do
should contain_nova_config('ironic/project_name').with(:value => ironic_tenant)
should contain_nova_config('ironic/auth_url').with(:value => "#{admin_uri}/v2.0")
should contain_nova_config('DEFAULT/compute_driver').with(:value => 'ironic.IronicDriver')
should contain_nova_config('DEFAULT/compute_manager').with(:value => 'ironic.nova.compute.manager.ClusteredComputeManager')
should contain_nova_config('neutron/auth_url').with(:value => "#{admin_uri}/v3")
should contain_nova_config('DEFAULT/max_concurrent_builds').with(:value => '50')
@ -151,6 +150,16 @@ describe manifest do
:allow_resize_to_same_host => Noop.puppet_function('pick', nova_hash['allow_resize_to_same_host'], true)
)
end
let(:default_availability_zone) { Noop.puppet_function 'pick', nova_hash['default_availability_zone'], facts[:os_service_default] }
let(:default_schedule_zone) { Noop.puppet_function 'pick', nova_hash['default_schedule_zone'], facts[:os_service_default] }
it 'should configure availability zones' do
should contain_class('nova::availability_zone').with(
'default_availability_zone' => default_availability_zone,
'default_schedule_zone' => default_schedule_zone,
)
end
end
end