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>
101 lines
2.7 KiB
Ruby
101 lines
2.7 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'nova::db::mysql' do
|
|
|
|
shared_examples_for 'nova::db::mysql' do
|
|
|
|
let :pre_condition do
|
|
'include mysql::server'
|
|
end
|
|
|
|
let :required_params do
|
|
{ :password => "qwerty" }
|
|
end
|
|
|
|
context 'with only required params' do
|
|
let :params do
|
|
required_params
|
|
end
|
|
it { is_expected.to contain_openstacklib__db__mysql('nova').with(
|
|
:user => 'nova',
|
|
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
|
|
:charset => 'utf8',
|
|
:collate => 'utf8_general_ci',
|
|
)}
|
|
|
|
it { is_expected.to contain_openstacklib__db__mysql('nova_cell0').with(
|
|
:user => 'nova',
|
|
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
|
|
:charset => 'utf8',
|
|
:collate => 'utf8_general_ci',
|
|
:create_user => false,
|
|
)}
|
|
end
|
|
|
|
context 'overriding allowed_hosts param to array' do
|
|
let :params do
|
|
{ :password => 'novapass',
|
|
:allowed_hosts => ['127.0.0.1','%'],
|
|
}.merge(required_params)
|
|
end
|
|
|
|
it { is_expected.to contain_openstacklib__db__mysql('nova').with(
|
|
:user => 'nova',
|
|
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
|
|
:charset => 'utf8',
|
|
:collate => 'utf8_general_ci',
|
|
:allowed_hosts => ['127.0.0.1','%'],
|
|
)}
|
|
end
|
|
|
|
context 'overriding allowed_hosts param to string' do
|
|
let :params do
|
|
{ :password => 'novapass2',
|
|
:allowed_hosts => '192.168.1.1',
|
|
}.merge(required_params)
|
|
end
|
|
|
|
it { is_expected.to contain_openstacklib__db__mysql('nova').with(
|
|
:user => 'nova',
|
|
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
|
|
:charset => 'utf8',
|
|
:collate => 'utf8_general_ci',
|
|
:allowed_hosts => '192.168.1.1',
|
|
)}
|
|
end
|
|
|
|
context 'when overriding charset' do
|
|
let :params do
|
|
{ :password => 'novapass',
|
|
:charset => 'latin1',
|
|
}.merge(required_params)
|
|
end
|
|
|
|
it { is_expected.to contain_openstacklib__db__mysql('nova').with(
|
|
:charset => 'latin1',
|
|
)}
|
|
end
|
|
|
|
context 'when disabling cell0 setup' do
|
|
let :params do
|
|
{ :setup_cell0 => false}.merge(required_params)
|
|
end
|
|
|
|
it { is_expected.to_not contain_openstacklib__db__mysql('nova_cell0') }
|
|
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::db::mysql'
|
|
end
|
|
end
|
|
|
|
end
|