From 9673aabd4f0e56e1bdbe44128be37e7088f7ec38 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Mon, 20 Feb 2017 13:31:35 -0500
Subject: [PATCH] Install ironic-common in pxe module if not defined

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
---
 manifests/init.pp | 9 ++++-----
 manifests/pxe.pp  | 5 +++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4c0ed6c6..10a554ef 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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")
   }
 
-  package { 'ironic-common':
-    ensure => $package_ensure,
-    name   => $::ironic::params::common_package_name,
-    tag    => ['openstack', 'ironic-package'],
-  }
+  ensure_resource( 'package', 'ironic-common', {
+      ensure => $package_ensure,
+      name   => $::ironic::params::common_package_name,
+      tag    => ['openstack', 'ironic-package'],})
 
   package { 'ironic-lib':
     ensure => $package_ensure,
diff --git a/manifests/pxe.pp b/manifests/pxe.pp
index 5b7ecbe9..c1041767 100644
--- a/manifests/pxe.pp
+++ b/manifests/pxe.pp
@@ -67,6 +67,11 @@ class ironic::pxe (
     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":
     ensure  => 'directory',
     seltype => 'tftpdir_t',