Fix incomplete assertion of conductor package/service
Change-Id: Iafdff0cfcfe92bbae8c246c27c4d3b3a6f18776e
This commit is contained in:
@@ -47,21 +47,20 @@ describe 'ironic::conductor' do
|
||||
it { is_expected.to contain_class('ironic::drivers::agent') }
|
||||
|
||||
it 'installs ironic conductor package' do
|
||||
if platform_params.has_key?(:conductor_package)
|
||||
is_expected.to contain_package('ironic-conductor').with(
|
||||
:name => platform_params[:conductor_package],
|
||||
:ensure => p[:package_ensure],
|
||||
:tag => ['openstack', 'ironic-package'],
|
||||
)
|
||||
is_expected.to contain_package('ironic-conductor').that_requires('Anchor[ironic::install::begin]')
|
||||
is_expected.to contain_package('ironic-conductor').that_notifies('Anchor[ironic::install::end]')
|
||||
end
|
||||
is_expected.to contain_package('ironic-conductor').with(
|
||||
:name => platform_params[:conductor_package],
|
||||
:ensure => p[:package_ensure],
|
||||
:tag => ['openstack', 'ironic-package'],
|
||||
)
|
||||
end
|
||||
|
||||
it 'ensure ironic conductor service is running' do
|
||||
is_expected.to contain_service('ironic-conductor').with(
|
||||
'hasstatus' => true,
|
||||
'tag' => 'ironic-service',
|
||||
:ensure => 'running',
|
||||
:name => platform_params[:conductor_service],
|
||||
:enable => true,
|
||||
:hasstatus => true,
|
||||
:tag => 'ironic-service',
|
||||
)
|
||||
end
|
||||
|
||||
@@ -217,7 +216,8 @@ describe 'ironic::conductor' do
|
||||
end
|
||||
when 'RedHat'
|
||||
let :platform_params do
|
||||
{ :conductor_service => 'ironic-conductor' }
|
||||
{ :conductor_package => 'openstack-ironic-conductor',
|
||||
:conductor_service => 'openstack-ironic-conductor' }
|
||||
end
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user