
Rather than use simple_cell_setup which expects that there are already existing computes, this change uses map_cell0 & create_cell to setup cell_v2. Once the computes are configured, the cell_v2 discover_hosts should be used to finalized the installation. In addition, the db syncs need to be reordered as the api db sync should run before the the cell_v2 setup. The main db sync should run after. map_cell0/simple_cell_setup now uses main nova DB connection instead of the api DB connection. Change-Id: I591b451197dc3bd0783978f5e3d2b1c830afe54e Closes-Bug: #1656276 Related-Bug: #1656673 Co-Authored-By: Alex Schultz <aschultz@redhat.com>
54 lines
1.5 KiB
Ruby
54 lines
1.5 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'nova::cell_v2::simple_setup' do
|
|
|
|
shared_examples_for 'nova::cell_v2::simple_setup' do
|
|
context 'with defaults' do
|
|
|
|
it {
|
|
is_expected.to contain_class('nova::cell_v2::map_cell0')
|
|
is_expected.to contain_nova__cell_v2__cell('default').with(
|
|
:extra_params => '',
|
|
:transport_url => nil,
|
|
:database_conneciton => nil
|
|
)
|
|
is_expected.to contain_class('nova::cell_v2::discover_hosts')
|
|
}
|
|
end
|
|
|
|
context "overriding extra_params" do
|
|
let :params do
|
|
{
|
|
:extra_params => '--config-file /etc/nova/nova.conf',
|
|
:transport_url => 'rabbit://user:pass@host:1234/virt',
|
|
:database_connection => 'mysql://nova:pass@host:1234/nova'
|
|
}
|
|
end
|
|
|
|
it {
|
|
is_expected.to contain_class('nova::cell_v2::map_cell0')
|
|
is_expected.to contain_nova__cell_v2__cell('default').with(
|
|
:extra_params => params[:extra_params],
|
|
:transport_url => params[:transport_url],
|
|
:database_connection => params[:database_connection]
|
|
)
|
|
is_expected.to contain_class('nova::cell_v2::discover_hosts')
|
|
}
|
|
end
|
|
end
|
|
|
|
|
|
on_supported_os({
|
|
:supported_os => OSDefaults.get_supported_os
|
|
}).each do |os,facts|
|
|
context "on #{os}" do
|
|
let (:facts) do
|
|
facts.merge(OSDefaults.get_facts())
|
|
end
|
|
|
|
it_configures 'nova::cell_v2::simple_setup'
|
|
end
|
|
end
|
|
|
|
end
|