Merge "Fix dependency references"

manifests/bifrost.pp

@@ -206,13 +206,16 @@ class ironic::bifrost (
   file { "${bifrost_config_folder}/bifrost_global_vars":
     ensure  => present,
     content => template('ironic/bifrost_global_vars.erb'),
-    require => File[$bifrost_config_folder],
+    tag     => 'bifrost-file',
   }
 
   file { "${bifrost_config_folder}/baremetal.json":
     ensure  => present,
     content => template('ironic/baremetal.json.erb'),
-    require => File[$bifrost_config_folder],
+    tag     => 'bifrost-file',
   }
+
+  File<| title == $bifrost_config_folder |> ~> File<| tag == 'bifrost-file' |>
+
 }
 

manifests/pxe.pp

@@ -77,7 +77,7 @@ class ironic::pxe (
     seltype => 'tftpdir_t',
     owner   => 'ironic',
     group   => 'ironic',
-    require => Package['ironic-common'],
+    require => Anchor['ironic::install::end'],
   }
 
   file { $http_root_real:
@@ -118,13 +118,13 @@ class ironic::pxe (
   ensure_resource( 'package', 'syslinux', {
     ensure => $package_ensure,
     name   => $::ironic::params::syslinux_package,
-    tag    => ['openstack', 'ironic-ipxe'],
+    tag    => ['openstack', 'ironic-ipxe', 'ironic-support-package'],
   })
 
   ironic::pxe::tftpboot_file { $syslinux_files:
     source_directory      => $syslinux_path,
     destination_directory => $tftp_root_real,
-    require               => Package['syslinux'],
+    require               => Anchor['ironic-inspector::install::end'],
   }
 
   ensure_resource( 'package', 'ipxe', {
@@ -141,7 +141,7 @@ class ironic::pxe (
     mode    => '0744',
     source  => "${::ironic::params::ipxe_rom_dir}/undionly.kpxe",
     backup  => false,
-    require => Package['ipxe'],
+    require => Anchor['ironic-inspector::install::end'],
   }
 
   file { "${tftp_root_real}/ipxe.efi":
@@ -152,7 +152,7 @@ class ironic::pxe (
     mode    => '0744',
     source  => "${::ironic::params::ipxe_rom_dir}/ipxe.efi",
     backup  => false,
-    require => Package['ipxe'],
+    require => Anchor['ironic-inspector::install::end'],
   }
 
   include ::apache

spec/classes/ironic_bifrost_spec.rb

@@ -75,7 +75,6 @@ describe 'ironic::bifrost' do
   it 'should contain file /etc/bifrost/bifrost_global_vars' do
     is_expected.to contain_file('/etc/bifrost/bifrost_global_vars').with(
       'ensure'  => 'present',
-      'require' => 'File[/etc/bifrost]',
       'content' => /ironic_url/,
     )
   end
@@ -83,7 +82,6 @@ describe 'ironic::bifrost' do
   it 'should contain file /etc/bifrost/baremetal.json' do
     is_expected.to contain_file('/etc/bifrost/baremetal.json').with(
       'ensure'  => 'present',
-      'require' => 'File[/etc/bifrost]',
       'content' => /test/,
     )
   end

spec/classes/ironic_pxe_spec.rb

@@ -33,7 +33,7 @@ describe 'ironic::pxe' do
       is_expected.to contain_file('/tftpboot/pxelinux.cfg').with(
         'owner'   => 'ironic',
         'group'   => 'ironic',
-        'require' => 'Package[ironic-common]',
+        'require' => 'Anchor[ironic::install::end]',
         'ensure'  => 'directory',
         'seltype' => 'tftpdir_t',
       )
@@ -103,7 +103,7 @@ describe 'ironic::pxe' do
         is_expected.to contain_file('/var/lib/tftpboot/undionly.kpxe').with(
           'owner'   => 'ironic',
           'group'   => 'ironic',
-          'require' => 'Package[ipxe]',
+          'require' => 'Anchor[ironic-inspector::install::end]',
           'seltype' => 'tftpdir_t',
           'ensure'  => 'present',
           'backup'  => false,
@@ -113,7 +113,7 @@ describe 'ironic::pxe' do
         is_expected.to contain_file('/var/lib/tftpboot/ipxe.efi').with(
           'owner'   => 'ironic',
           'group'   => 'ironic',
-          'require' => 'Package[ipxe]',
+          'require' => 'Anchor[ironic-inspector::install::end]',
           'seltype' => 'tftpdir_t',
           'ensure'  => 'present',
           'backup'  => false,