openstack/fuel-library
Code Issues Proposed changes

Fix unmatched integration noop tests for ironic

Browse Source 
Fix ironic compute cases:
* use neutron/auth_url v3 instead of the admin_auth_url v2.0
* use keystone_authtoken/memcached_servers instead of defaults/

Partial-bug: #1563215

Change-Id: Iebabae215258891ebf4a793ae489d79b98c9bede
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2016-03-29 10:52:45 +02:00
parent 714951e56d
commit b9e5c66aad
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/noop/spec/hosts/ironic/ironic-compute_spec.rb
View File

@ -2,9 +2,8 @@ require 'spec_helper'
require 'shared-examples' require 'shared-examples'
manifest = 'roles/ironic-compute.pp' manifest = 'roles/ironic-compute.pp'
# FIXME: neut_vlan.ironic.conductor.yaml ubuntu # RUN: neut_vlan.ironic.conductor.yaml ubuntu
# FIXME: neut_vlan.ironic.controller.yaml ubuntu # RUN: neut_vlan.ironic.controller.yaml ubuntu
# SKIP_HIERA: neut_vlan.ironic.controller
describe manifest do describe manifest do
@ -57,7 +56,7 @@ describe manifest do
should contain_nova_config('DEFAULT/compute_driver').with(:value => 'ironic.IronicDriver') 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('DEFAULT/compute_manager').with(:value => 'ironic.nova.compute.manager.ClusteredComputeManager')
should contain_nova_config('ironic/admin_url').with(:value => "#{admin_uri}/v2.0") should contain_nova_config('ironic/admin_url').with(:value => "#{admin_uri}/v2.0")
should contain_nova_config('neutron/admin_auth_url').with(:value => "#{admin_uri}/v2.0") should contain_nova_config('neutron/auth_url').with(:value => "#{admin_uri}/v3")
end end
it 'nova config should have reserved_host_memory_mb set to 0' do it 'nova config should have reserved_host_memory_mb set to 0' do
@ -65,7 +64,7 @@ describe manifest do
end end
it 'nova config should contain right memcached servers list' do it 'nova config should contain right memcached servers list' do
should contain_nova_config('DEFAULT/memcached_servers').with( should contain_nova_config('keystone_authtoken/memcached_servers').with(
'value' => memcache_servers, 'value' => memcache_servers,
) )
end end
@ -79,7 +78,7 @@ describe manifest do
:name => "p_nova_compute_ironic", :name => "p_nova_compute_ironic",
:ensure => "present", :ensure => "present",
:primitive_class => "ocf", :primitive_class => "ocf",
:primitive_provider => "pacemaker", :primitive_provider => "fuel",
:primitive_type => "nova-compute", :primitive_type => "nova-compute",
:metadata => {"resource-stickiness" => "1"}, :metadata => {"resource-stickiness" => "1"},
:parameters => {"config" => "/etc/nova/nova.conf", :parameters => {"config" => "/etc/nova/nova.conf",