openstack/puppet-ironic
Code Issues Proposed changes

Install ironic-common in pxe module if not defined

Browse Source 
This will help resolve issues in configuring the ironic-inspector
with docker which uses an isolated puppet run to generate
ironic-inspector configs.

Change-Id: Iff05045ee5f5ed69777689d4fcc0bae6362d2b72
Closes-bug: #1666287
This commit is contained in:
Dan Prince
2017-02-20 13:31:35 -05:00
parent 9041a3af23
commit 9673aabd4f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

@@ -386,11 +386,10 @@ ironic::glance_num_retries are deprecated in favor of ironic::glance::api_server
ironic::glance::api_insecure and ironic::glance::num_retries accordingly") ironic::glance::api_insecure and ironic::glance::num_retries accordingly")
} }
package { 'ironic-common': ensure_resource( 'package', 'ironic-common', {
ensure => $package_ensure, ensure => $package_ensure,
name => $::ironic::params::common_package_name, name => $::ironic::params::common_package_name,
tag => ['openstack', 'ironic-package'], tag => ['openstack', 'ironic-package'],})
}
package { 'ironic-lib': package { 'ironic-lib':
ensure => $package_ensure, ensure => $package_ensure,

5
manifests/pxe.pp
View File

@@ -67,6 +67,11 @@ class ironic::pxe (
before => Anchor['ironic::config::end'], before => Anchor['ironic::config::end'],
} }
ensure_resource( 'package', 'ironic-common', {
ensure => $package_ensure,
name => $::ironic::params::common_package_name,
tag => ['openstack', 'ironic-package'],})
file { "${tftp_root_real}/pxelinux.cfg": file { "${tftp_root_real}/pxelinux.cfg":
ensure => 'directory', ensure => 'directory',
seltype => 'tftpdir_t', seltype => 'tftpdir_t',