Align stars to fix puppet-ci
1) Stop doing cell v2 Since cell v2 setup still needs work, we need to stop doing it in the beaker tests for now. 2) Fix libvirt for ubuntu Ubuntu updated their libvirt package to 2.5.0 which has the debian service and filename conventions. Change-Id: Ic315ae015300f536e88ae0b2a8808fcd6126ac37 Related-Bug: #1656276 Closes-Bug: #1657251
This commit is contained in:
parent
25a7c072b0
commit
d2597b32c8
|
@ -120,7 +120,6 @@ class nova::params {
|
|||
$vncproxy_package_name = 'nova-consoleproxy'
|
||||
# Use default provider on Debian
|
||||
$special_service_provider = undef
|
||||
$libvirt_service_name = 'libvirtd'
|
||||
$virtlock_service_name = undef
|
||||
$virtlog_service_name = undef
|
||||
}
|
||||
|
@ -130,11 +129,11 @@ class nova::params {
|
|||
$vncproxy_package_name = 'nova-novncproxy'
|
||||
# Use default provider on Debian
|
||||
$special_service_provider = undef
|
||||
$libvirt_service_name = 'libvirt-bin'
|
||||
$virtlock_service_name = 'virtlockd'
|
||||
$virtlog_service_name = 'virtlogd'
|
||||
}
|
||||
}
|
||||
$libvirt_service_name = 'libvirtd'
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Ubuntu updated their libvirt package to 2.5.0 which uses the Debian name
|
||||
for libvirtd configurations and services. The module has been updated to
|
||||
use the new naming conventions for the configuration files. If using the
|
||||
Ocata module with the Newton packages, be aware that the configuration
|
||||
of the default files may not work correctly.
|
|
@ -56,9 +56,10 @@ describe 'basic nova' do
|
|||
password => 'a_big_secret',
|
||||
}
|
||||
# TODO(aschultz): remove this once https://review.openstack.org/#/c/409970/ lands
|
||||
class { '::nova::db::sync_cell_v2':
|
||||
transport_url => 'rabbit://nova:an_even_bigger_secret@127.0.0.1:5672/',
|
||||
}
|
||||
# TODO(aschultz): don't do this until resolution for LP#1656276
|
||||
#class { '::nova::db::sync_cell_v2':
|
||||
# transport_url => 'rabbit://nova:an_even_bigger_secret@127.0.0.1:5672/',
|
||||
#}
|
||||
class { '::nova::api':
|
||||
service_name => 'httpd',
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ describe 'nova::compute::libvirt' do
|
|||
|
||||
it {
|
||||
is_expected.to contain_package('libvirt').with(
|
||||
:name => 'libvirt-bin',
|
||||
:name => 'libvirtd',
|
||||
:ensure => 'present'
|
||||
)
|
||||
is_expected.to contain_package('libvirt').that_requires('Anchor[nova::install::begin]')
|
||||
|
@ -39,7 +39,7 @@ describe 'nova::compute::libvirt' do
|
|||
|
||||
it {
|
||||
is_expected.to contain_service('libvirt').with(
|
||||
:name => 'libvirt-bin',
|
||||
:name => 'libvirtd',
|
||||
:enable => true,
|
||||
:ensure => 'running',
|
||||
)
|
||||
|
@ -148,7 +148,7 @@ describe 'nova::compute::libvirt' do
|
|||
|
||||
it { is_expected.to contain_class('nova::migration::libvirt')}
|
||||
it { is_expected.to contain_nova_config('vnc/vncserver_listen').with_value('0.0.0.0')}
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirt-bin libvirtd opts').with(:line => libvirt_options) }
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) }
|
||||
it { is_expected.to contain_file_line('/etc/libvirt/libvirtd.conf listen_tls').with(:line => "listen_tls = 0") }
|
||||
it { is_expected.to contain_file_line('/etc/libvirt/libvirtd.conf listen_tcp').with(:line => "listen_tcp = 1") }
|
||||
it { is_expected.not_to contain_file_line('/etc/libvirt/libvirtd.conf auth_tls')}
|
||||
|
@ -163,7 +163,7 @@ describe 'nova::compute::libvirt' do
|
|||
|
||||
it { is_expected.to contain_class('nova::migration::libvirt')}
|
||||
it { is_expected.to contain_nova_config('vnc/vncserver_listen').with_value('::0')}
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirt-bin libvirtd opts').with(:line => libvirt_options) }
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) }
|
||||
it { is_expected.to contain_file_line('/etc/libvirt/libvirtd.conf listen_tls').with(:line => "listen_tls = 0") }
|
||||
it { is_expected.to contain_file_line('/etc/libvirt/libvirtd.conf listen_tcp').with(:line => "listen_tcp = 1") }
|
||||
it { is_expected.not_to contain_file_line('/etc/libvirt/libvirtd.conf auth_tls')}
|
||||
|
|
|
@ -154,7 +154,7 @@ describe 'nova::migration::libvirt' do
|
|||
end
|
||||
|
||||
it_configures 'nova migration with libvirt'
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirt-bin libvirtd opts').with(:line => 'libvirtd_opts="-l"') }
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => 'libvirtd_opts="-l"') }
|
||||
end
|
||||
|
||||
context 'on Debian platforms release' do
|
||||
|
@ -167,7 +167,7 @@ describe 'nova::migration::libvirt' do
|
|||
end
|
||||
|
||||
it_configures 'nova migration with libvirt'
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirt-bin libvirtd opts').with(:line => 'libvirtd_opts="-d -l"') }
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => 'libvirtd_opts="-d -l"') }
|
||||
end
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
|
|
Loading…
Reference in New Issue