dc2f3a3586
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>
90 lines
2.5 KiB
Ruby
90 lines
2.5 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'nova::db::sync' do
|
|
|
|
shared_examples_for 'nova-dbsync' do
|
|
|
|
it 'runs nova-db-sync' do
|
|
is_expected.to contain_exec('nova-db-sync').with(
|
|
:command => '/usr/bin/nova-manage db sync',
|
|
:refreshonly => 'true',
|
|
:try_sleep => 5,
|
|
:tries => 10,
|
|
:timeout => 300,
|
|
:logoutput => 'on_failure',
|
|
:subscribe => ['Anchor[nova::install::end]',
|
|
'Anchor[nova::config::end]',
|
|
'Anchor[nova::db::end]',
|
|
'Anchor[nova::dbsync::begin]'],
|
|
:notify => 'Anchor[nova::dbsync::end]',
|
|
)
|
|
end
|
|
|
|
describe "overriding extra_params" do
|
|
let :params do
|
|
{
|
|
:extra_params => '--config-file /etc/nova/nova.conf',
|
|
}
|
|
end
|
|
|
|
it {
|
|
is_expected.to contain_exec('nova-db-sync').with(
|
|
:command => '/usr/bin/nova-manage --config-file /etc/nova/nova.conf db sync',
|
|
:refreshonly => 'true',
|
|
:try_sleep => 5,
|
|
:tries => 10,
|
|
:timeout => 300,
|
|
:logoutput => 'on_failure',
|
|
:subscribe => ['Anchor[nova::install::end]',
|
|
'Anchor[nova::config::end]',
|
|
'Anchor[nova::db::end]',
|
|
'Anchor[nova::dbsync::begin]'],
|
|
:notify => 'Anchor[nova::dbsync::end]',
|
|
)
|
|
}
|
|
end
|
|
|
|
describe "overriding db_sync_timeout" do
|
|
let :params do
|
|
{
|
|
:db_sync_timeout => 750,
|
|
}
|
|
end
|
|
|
|
it {
|
|
is_expected.to contain_exec('nova-db-sync').with(
|
|
:command => '/usr/bin/nova-manage db sync',
|
|
:refreshonly => 'true',
|
|
:try_sleep => 5,
|
|
:tries => 10,
|
|
:timeout => 750,
|
|
:logoutput => 'on_failure',
|
|
:subscribe => ['Anchor[nova::install::end]',
|
|
'Anchor[nova::config::end]',
|
|
'Anchor[nova::db::end]',
|
|
'Anchor[nova::dbsync::begin]'],
|
|
:notify => 'Anchor[nova::dbsync::end]',
|
|
)
|
|
}
|
|
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({
|
|
:processorcount => 8,
|
|
:concat_basedir => '/var/lib/puppet/concat'
|
|
}))
|
|
end
|
|
|
|
it_configures 'nova-dbsync'
|
|
end
|
|
end
|
|
|
|
end
|