Adapt ironic-conductor manifest

Upstream puppet-ironic patch I2f929ee43566b29add097bc8ef29d818c62c4684
broke ironic deployment and noop tests so we need to adapt our library.

Change-Id: Ieaaa66b674abf93662717c0f0b8838128447aa04
Closes-bug: #1617332
This commit is contained in:
Denis Egorenko 2016-08-26 17:00:34 +03:00
parent 98a8993411
commit f184f30acd
2 changed files with 5 additions and 4 deletions

View File

@ -157,10 +157,7 @@ class openstack_tasks::roles::ironic_conductor {
require => File["${tftp_root}/map-file"],
}
package { 'ipmitool':
ensure => 'present',
before => Class['::ironic::conductor'],
}
ensure_packages('ipmitool', { ensure => 'present' })
file { '/etc/ironic/fuel_key':
ensure => present,

View File

@ -36,6 +36,10 @@ describe manifest do
)
end
it 'should contain ipmitool package' do
should contain_package('ipmitool')
end
it 'should declare ironic::conductor class correctly' do
should contain_class('ironic::conductor').with(
'api_url' => "http://#{baremetal_vip}:6385",